summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_view_host.cc5
-rw-r--r--content/common/child_process_messages.h4
-rw-r--r--content/common/child_thread.cc5
-rw-r--r--content/common/content_message_generator.h7
-rw-r--r--content/common/view_messages.h333
-rw-r--r--content/renderer/command_buffer_proxy.cc2
-rw-r--r--content/renderer/render_view.cc16
-rw-r--r--content/renderer/renderer_webkitclient_impl.cc1
8 files changed, 320 insertions, 53 deletions
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc
index d5c4747..b5143ae 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -27,6 +27,7 @@
#include "chrome/common/net/url_request_context_getter.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/render_messages_params.h"
+#include "chrome/common/safebrowsing_messages.h"
#include "chrome/common/thumbnail_score.h"
#include "chrome/common/translate_errors.h"
#include "chrome/common/url_constants.h"
@@ -1318,7 +1319,7 @@ void RenderViewHost::OnUserGesture() {
}
void RenderViewHost::GetMalwareDOMDetails() {
- Send(new ViewMsg_GetMalwareDOMDetails(routing_id()));
+ Send(new SafeBrowsingMsg_GetMalwareDOMDetails(routing_id()));
}
void RenderViewHost::GetAllSavableResourceLinksForCurrentPage(
@@ -1576,7 +1577,7 @@ void RenderViewHost::OnAccessibilityNotifications(
const ViewHostMsg_AccessibilityNotification_Params& param = params[i];
if (param.notification_type ==
- ViewHostMsg_AccessibilityNotification_Params::
+ ViewHostMsg_AccessibilityNotification_Type::
NOTIFICATION_TYPE_LOAD_COMPLETE) {
// TODO(ctguil): Remove when mac processes OnAccessibilityNotifications.
if (view())
diff --git a/content/common/child_process_messages.h b/content/common/child_process_messages.h
index ac26b18..6850da2 100644
--- a/content/common/child_process_messages.h
+++ b/content/common/child_process_messages.h
@@ -43,9 +43,13 @@ IPC_MESSAGE_CONTROL0(ChildProcessHostMsg_EndTracingAck)
IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_TraceDataCollected,
std::string /*json trace data*/)
+// NaCl's 64 bit Windows build only links with a bare-minimum number of
+// libraries, and GURL isn't one of them.
+#if !defined(NACL_WIN64)
// Get the list of proxies to use for |url|, as a semicolon delimited list
// of "<TYPE> <HOST>:<PORT>" | "DIRECT".
IPC_SYNC_MESSAGE_CONTROL1_2(ChildProcessHostMsg_ResolveProxy,
GURL /* url */,
int /* network error */,
std::string /* proxy list */)
+#endif
diff --git a/content/common/child_thread.cc b/content/common/child_thread.cc
index 4d49324..574b43b 100644
--- a/content/common/child_thread.cc
+++ b/content/common/child_thread.cc
@@ -59,9 +59,8 @@ void ChildThread::Init() {
channel_->AddFilter(sync_message_filter_.get());
#if !defined(NACL_WIN64)
- // Currently, the NaCl 64 DLL build requires a lot of extra dependencies to
- // support IPC messages with parameters, so until there's a need for trace in
- // NaCl, this is reserved for non-NaCl builds.
+ // This brings in a depenency on gpu, which isn't linked in with NaCl's win64
+ // build.
channel_->AddFilter(new ChildTraceMessageFilter());
#endif
diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h
index 3aea66c..6a29d6c 100644
--- a/content/common/content_message_generator.h
+++ b/content/common/content_message_generator.h
@@ -4,9 +4,13 @@
// Multiply-included file, hence no include guard.
+#include "content/common/child_process_messages.h"
+
+// NaCl's 64 bit Windows build only links with a bare-minimum number of
+// libraries.
+#if !defined(NACL_WIN64)
#include "content/common/appcache_messages.h"
#include "content/common/audio_messages.h"
-#include "content/common/child_process_messages.h"
#include "content/common/clipboard_messages.h"
#include "content/common/database_messages.h"
#include "content/common/desktop_notification_messages.h"
@@ -28,3 +32,4 @@
#include "content/common/view_messages.h"
#include "content/common/webblob_messages.h"
#include "content/common/worker_messages.h"
+#endif
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index a6be921..e867ca2 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -6,6 +6,7 @@
// Multiply-included message file, hence no include guard.
#include "base/process.h"
+#include "base/shared_memory.h"
#include "content/common/common_param_traits.h"
#include "content/common/css_colors.h"
#include "content/common/edit_command.h"
@@ -22,12 +23,14 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputType.h"
#include "ui/gfx/rect.h"
#include "webkit/glue/context_menu.h"
#include "webkit/glue/password_form.h"
#include "webkit/glue/webcookie.h"
#include "webkit/glue/webmenuitem.h"
#include "webkit/glue/webpreferences.h"
+#include "webkit/glue/webaccessibility.h"
#include "webkit/plugins/npapi/webplugin.h"
#include "webkit/plugins/npapi/webplugininfo.h"
@@ -39,6 +42,28 @@
#ifndef CONTENT_COMMON_VIEW_MESSAGES_H_
#define CONTENT_COMMON_VIEW_MESSAGES_H_
+struct ViewHostMsg_AccessibilityNotification_Type {
+ enum Value {
+ // The node checked state has changed.
+ NOTIFICATION_TYPE_CHECK_STATE_CHANGED,
+
+ // The node tree structure has changed.
+ NOTIFICATION_TYPE_CHILDREN_CHANGED,
+
+ // The node in focus has changed.
+ NOTIFICATION_TYPE_FOCUS_CHANGED,
+
+ // The document node has loaded.
+ NOTIFICATION_TYPE_LOAD_COMPLETE,
+
+ // The node value has changed.
+ NOTIFICATION_TYPE_VALUE_CHANGED,
+
+ // The text cursor or selection changed.
+ NOTIFICATION_TYPE_SELECTED_TEXT_CHANGED,
+ };
+};
+
struct ViewHostMsg_RunFileChooser_Mode {
public:
enum Value {
@@ -124,14 +149,18 @@ IPC_ENUM_TRAITS(NavigationGesture)
IPC_ENUM_TRAITS(PageZoom::Function)
IPC_ENUM_TRAITS(RendererPreferencesHintingEnum)
IPC_ENUM_TRAITS(RendererPreferencesSubpixelRenderingEnum)
+IPC_ENUM_TRAITS(ViewHostMsg_AccessibilityNotification_Type::Value)
IPC_ENUM_TRAITS(ViewHostMsg_RunFileChooser_Mode::Value)
IPC_ENUM_TRAITS(ViewMsg_Navigate_Type::Value)
IPC_ENUM_TRAITS(ViewMsg_StopFinding_Params::Action)
IPC_ENUM_TRAITS(WebKit::WebContextMenuData::MediaType)
IPC_ENUM_TRAITS(WebKit::WebMediaPlayerAction::Type)
IPC_ENUM_TRAITS(WebKit::WebPopupType)
+IPC_ENUM_TRAITS(WebKit::WebTextInputType)
IPC_ENUM_TRAITS(WebMenuItem::Type)
IPC_ENUM_TRAITS(WindowContainerType)
+IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::Role)
+IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::State)
IPC_STRUCT_TRAITS_BEGIN(ContextMenuParams)
IPC_STRUCT_TRAITS_MEMBER(media_type)
@@ -303,6 +332,19 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::CustomContextMenuContext)
IPC_STRUCT_TRAITS_MEMBER(request_id)
IPC_STRUCT_TRAITS_END()
+IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebAccessibility)
+ IPC_STRUCT_TRAITS_MEMBER(id)
+ IPC_STRUCT_TRAITS_MEMBER(name)
+ IPC_STRUCT_TRAITS_MEMBER(value)
+ IPC_STRUCT_TRAITS_MEMBER(role)
+ IPC_STRUCT_TRAITS_MEMBER(state)
+ IPC_STRUCT_TRAITS_MEMBER(location)
+ IPC_STRUCT_TRAITS_MEMBER(attributes)
+ IPC_STRUCT_TRAITS_MEMBER(children)
+ IPC_STRUCT_TRAITS_MEMBER(indirect_child_ids)
+ IPC_STRUCT_TRAITS_MEMBER(html_attributes)
+IPC_STRUCT_TRAITS_END()
+
IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebCookie)
IPC_STRUCT_TRAITS_MEMBER(name)
IPC_STRUCT_TRAITS_MEMBER(value)
@@ -470,47 +512,16 @@ IPC_STRUCT_BEGIN(ViewHostMsg_FrameNavigate_Params)
IPC_STRUCT_MEMBER(std::string, content_state)
IPC_STRUCT_END()
-IPC_STRUCT_BEGIN(ViewMsg_Navigate_Params)
- // The page_id for this navigation, or -1 if it is a new navigation. Back,
- // Forward, and Reload navigations should have a valid page_id. If the load
- // succeeds, then this page_id will be reflected in the resultant
- // ViewHostMsg_FrameNavigate message.
- IPC_STRUCT_MEMBER(int32, page_id)
-
- // If page_id is -1, then pending_history_list_offset will also be -1.
- // Otherwise, it contains the offset into the history list corresponding to
- // the current navigation.
- IPC_STRUCT_MEMBER(int, pending_history_list_offset)
-
- // Informs the RenderView of where its current page contents reside in
- // session history and the total size of the session history list.
- IPC_STRUCT_MEMBER(int, current_history_list_offset)
- IPC_STRUCT_MEMBER(int, current_history_list_length)
-
- // The URL to load.
- IPC_STRUCT_MEMBER(GURL, url)
-
- // The URL to send in the "Referer" header field. Can be empty if there is
- // no referrer.
- // TODO: consider folding this into extra_headers.
- IPC_STRUCT_MEMBER(GURL, referrer)
-
- // The type of transition.
- IPC_STRUCT_MEMBER(PageTransition::Type, transition)
-
- // Opaque history state (received by ViewHostMsg_UpdateState).
- IPC_STRUCT_MEMBER(std::string, state)
-
- // Type of navigation.
- IPC_STRUCT_MEMBER(ViewMsg_Navigate_Type::Value, navigation_type)
-
- // The time the request was created
- IPC_STRUCT_MEMBER(base::Time, request_time)
+IPC_STRUCT_BEGIN(ViewHostMsg_AccessibilityNotification_Params)
+ // Type of notification.
+ IPC_STRUCT_MEMBER(ViewHostMsg_AccessibilityNotification_Type::Value,
+ notification_type)
- // Extra headers (separated by \n) to send during the request.
- IPC_STRUCT_MEMBER(std::string, extra_headers)
+ // The accessibility node tree.
+ IPC_STRUCT_MEMBER(webkit_glue::WebAccessibility, acc_obj)
IPC_STRUCT_END()
+
IPC_STRUCT_BEGIN(ViewHostMsg_RunFileChooser_Params)
IPC_STRUCT_MEMBER(ViewHostMsg_RunFileChooser_Mode::Value, mode)
@@ -639,6 +650,47 @@ IPC_STRUCT_BEGIN(ViewMsg_ClosePage_Params)
IPC_STRUCT_MEMBER(int, new_request_id)
IPC_STRUCT_END()
+IPC_STRUCT_BEGIN(ViewMsg_Navigate_Params)
+ // The page_id for this navigation, or -1 if it is a new navigation. Back,
+ // Forward, and Reload navigations should have a valid page_id. If the load
+ // succeeds, then this page_id will be reflected in the resultant
+ // ViewHostMsg_FrameNavigate message.
+ IPC_STRUCT_MEMBER(int32, page_id)
+
+ // If page_id is -1, then pending_history_list_offset will also be -1.
+ // Otherwise, it contains the offset into the history list corresponding to
+ // the current navigation.
+ IPC_STRUCT_MEMBER(int, pending_history_list_offset)
+
+ // Informs the RenderView of where its current page contents reside in
+ // session history and the total size of the session history list.
+ IPC_STRUCT_MEMBER(int, current_history_list_offset)
+ IPC_STRUCT_MEMBER(int, current_history_list_length)
+
+ // The URL to load.
+ IPC_STRUCT_MEMBER(GURL, url)
+
+ // The URL to send in the "Referer" header field. Can be empty if there is
+ // no referrer.
+ // TODO: consider folding this into extra_headers.
+ IPC_STRUCT_MEMBER(GURL, referrer)
+
+ // The type of transition.
+ IPC_STRUCT_MEMBER(PageTransition::Type, transition)
+
+ // Opaque history state (received by ViewHostMsg_UpdateState).
+ IPC_STRUCT_MEMBER(std::string, state)
+
+ // Type of navigation.
+ IPC_STRUCT_MEMBER(ViewMsg_Navigate_Type::Value, navigation_type)
+
+ // The time the request was created
+ IPC_STRUCT_MEMBER(base::Time, request_time)
+
+ // Extra headers (separated by \n) to send during the request.
+ IPC_STRUCT_MEMBER(std::string, extra_headers)
+IPC_STRUCT_END()
+
IPC_STRUCT_BEGIN(ViewMsg_New_Params)
// The parent window's id.
IPC_STRUCT_MEMBER(gfx::NativeViewId, parent_window)
@@ -1070,6 +1122,22 @@ IPC_MESSAGE_ROUTED3(ViewMsg_AsyncOpenFile_ACK,
IPC_MESSAGE_ROUTED1(ViewMsg_NetworkStateChanged,
bool /* online */)
+// Enable accessibility in the renderer process.
+IPC_MESSAGE_ROUTED0(ViewMsg_EnableAccessibility)
+
+// Relay a request from assistive technology to set focus to a given node.
+IPC_MESSAGE_ROUTED1(ViewMsg_SetAccessibilityFocus,
+ int /* object id */)
+
+// Relay a request from assistive technology to perform the default action
+// on a given node.
+IPC_MESSAGE_ROUTED1(ViewMsg_AccessibilityDoDefaultAction,
+ int /* object id */)
+
+// Tells the render view that a ViewHostMsg_AccessibilityNotifications
+// message was processed and it can send addition notifications.
+IPC_MESSAGE_ROUTED0(ViewMsg_AccessibilityNotifications_ACK)
+
// Messages sent from the renderer to the browser.
@@ -1579,3 +1647,192 @@ IPC_MESSAGE_ROUTED1(ViewHostMsg_TakeFocus,
IPC_SYNC_MESSAGE_ROUTED1_1(ViewHostMsg_GetRootWindowRect,
gfx::NativeViewId /* window */,
gfx::Rect /* Out: Window location */)
+
+// Required for updating text input state.
+IPC_MESSAGE_ROUTED2(ViewHostMsg_ImeUpdateTextInputState,
+ WebKit::WebTextInputType, /* text_input_type */
+ gfx::Rect /* caret_rect */)
+
+// Required for cancelling an ongoing input method composition.
+IPC_MESSAGE_ROUTED0(ViewHostMsg_ImeCancelComposition)
+
+// WebKit and JavaScript error messages to log to the console
+// or debugger UI.
+IPC_MESSAGE_ROUTED3(ViewHostMsg_AddMessageToConsole,
+ std::wstring, /* msg */
+ int32, /* line number */
+ std::wstring /* source id */)
+
+// Sent by the renderer process to indicate that a plugin instance has
+// crashed.
+IPC_MESSAGE_ROUTED1(ViewHostMsg_CrashedPlugin,
+ FilePath /* plugin_path */)
+
+// Displays a box to confirm that the user wants to navigate away from the
+// page. Replies true if yes, false otherwise, the reply string is ignored,
+// but is included so that we can use OnJavaScriptMessageBoxClosed.
+IPC_SYNC_MESSAGE_ROUTED2_2(ViewHostMsg_RunBeforeUnloadConfirm,
+ GURL, /* in - originating frame URL */
+ std::wstring /* in - alert message */,
+ bool /* out - success */,
+ std::wstring /* out - This is ignored.*/)
+
+// Sent when the renderer process is done processing a DataReceived
+// message.
+IPC_MESSAGE_ROUTED1(ViewHostMsg_DataReceived_ACK,
+ int /* request_id */)
+
+IPC_MESSAGE_CONTROL1(ViewHostMsg_RevealFolderInOS,
+ FilePath /* path */)
+
+// Sent when a provisional load on the main frame redirects.
+IPC_MESSAGE_ROUTED3(ViewHostMsg_DidRedirectProvisionalLoad,
+ int /* page_id */,
+ GURL /* last url */,
+ GURL /* url redirected to */)
+
+// Sent when the renderer changes the zoom level for a particular url, so the
+// browser can update its records. If remember is true, then url is used to
+// update the zoom level for all pages in that site. Otherwise, the render
+// view's id is used so that only the menu is updated.
+IPC_MESSAGE_ROUTED3(ViewHostMsg_DidZoomURL,
+ double /* zoom_level */,
+ bool /* remember */,
+ GURL /* url */)
+
+// Updates the minimum/maximum allowed zoom percent for this tab from the
+// default values. If |remember| is true, then the zoom setting is applied to
+// other pages in the site and is saved, otherwise it only applies to this
+// tab.
+IPC_MESSAGE_ROUTED3(ViewHostMsg_UpdateZoomLimits,
+ int /* minimum_percent */,
+ int /* maximum_percent */,
+ bool /* remember */)
+
+#if defined(OS_WIN)
+// Duplicates a shared memory handle from the renderer to the browser. Then
+// the renderer can flush the handle.
+IPC_SYNC_MESSAGE_ROUTED1_1(ViewHostMsg_DuplicateSection,
+ base::SharedMemoryHandle /* renderer handle */,
+ base::SharedMemoryHandle /* browser handle */)
+#endif
+
+// Asks the browser to create a block of shared memory for the renderer to
+// fill in and pass back to the browser.
+IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_AllocateSharedMemoryBuffer,
+ uint32 /* buffer size */,
+ base::SharedMemoryHandle /* browser handle */)
+
+// Notify the browser that this render process can or can't be suddenly
+// terminated.
+IPC_MESSAGE_CONTROL1(ViewHostMsg_SuddenTerminationChanged,
+ bool /* enabled */)
+
+#if defined(OS_MACOSX)
+// On OSX, we cannot allocated shared memory from within the sandbox, so
+// this call exists for the renderer to ask the browser to allocate memory
+// on its behalf. We return a file descriptor to the POSIX shared memory.
+// If the |cache_in_browser| flag is |true|, then a copy of the shmem is kept
+// by the browser, and it is the caller's repsonsibility to send a
+// ViewHostMsg_FreeTransportDIB message in order to release the cached shmem.
+// In all cases, the caller is responsible for deleting the resulting
+// TransportDIB.
+IPC_SYNC_MESSAGE_CONTROL2_1(ViewHostMsg_AllocTransportDIB,
+ size_t, /* bytes requested */
+ bool, /* cache in the browser */
+ TransportDIB::Handle /* DIB */)
+
+// Since the browser keeps handles to the allocated transport DIBs, this
+// message is sent to tell the browser that it may release them when the
+// renderer is finished with them.
+IPC_MESSAGE_CONTROL1(ViewHostMsg_FreeTransportDIB,
+ TransportDIB::Id /* DIB id */)
+
+// Informs the browser that a plugin has gained or lost focus.
+IPC_MESSAGE_ROUTED2(ViewHostMsg_PluginFocusChanged,
+ bool, /* focused */
+ int /* plugin_id */)
+
+// Instructs the browser to start plugin IME.
+IPC_MESSAGE_ROUTED0(ViewHostMsg_StartPluginIme)
+
+//---------------------------------------------------------------------------
+// Messages related to accelerated plugins
+
+// This is sent from the renderer to the browser to allocate a fake
+// PluginWindowHandle on the browser side which is used to identify
+// the plugin to the browser later when backing store is allocated
+// or reallocated. |opaque| indicates whether the plugin's output is
+// considered to be opaque, as opposed to translucent. This message
+// is reused for rendering the accelerated compositor's output.
+// |root| indicates whether the output is supposed to cover the
+// entire window.
+IPC_SYNC_MESSAGE_ROUTED2_1(ViewHostMsg_AllocateFakePluginWindowHandle,
+ bool /* opaque */,
+ bool /* root */,
+ gfx::PluginWindowHandle /* id */)
+
+// Destroys a fake window handle previously allocated using
+// AllocateFakePluginWindowHandle.
+IPC_MESSAGE_ROUTED1(ViewHostMsg_DestroyFakePluginWindowHandle,
+ gfx::PluginWindowHandle /* id */)
+
+// This message, used on Mac OS X 10.5 and earlier (no IOSurface support),
+// is sent from the renderer to the browser on behalf of the plug-in
+// to indicate that a new backing store was allocated for that plug-in
+// instance.
+IPC_MESSAGE_ROUTED4(ViewHostMsg_AcceleratedSurfaceSetTransportDIB,
+ gfx::PluginWindowHandle /* window */,
+ int32 /* width */,
+ int32 /* height */,
+ TransportDIB::Handle /* handle for the DIB */)
+
+// This message, used on Mac OS X 10.6 and later (where IOSurface is
+// supported), is sent from the renderer to the browser on behalf of the
+// plug-in to indicate that a new backing store was allocated for that
+// plug-in instance.
+//
+// NOTE: the original intent was to pass a mach port as the IOSurface
+// identifier but it looks like that will be a lot of work. For now we pass an
+// ID from IOSurfaceGetID.
+IPC_MESSAGE_ROUTED4(ViewHostMsg_AcceleratedSurfaceSetIOSurface,
+ gfx::PluginWindowHandle /* window */,
+ int32 /* width */,
+ int32 /* height */,
+ uint64 /* surface_id */)
+
+// This message notifies the browser process that the plug-in
+// swapped the buffers associated with the given "window", which
+// should cause the browser to redraw the various plug-ins'
+// contents.
+IPC_MESSAGE_ROUTED2(ViewHostMsg_AcceleratedSurfaceBuffersSwapped,
+ gfx::PluginWindowHandle /* window */,
+ uint64 /* surface_id */)
+#endif
+
+// Sent to notify the browser about renderer accessibility notifications.
+// The browser responds with a ViewMsg_AccessibilityNotifications_ACK.
+IPC_MESSAGE_ROUTED1(
+ ViewHostMsg_AccessibilityNotifications,
+ std::vector<ViewHostMsg_AccessibilityNotification_Params>)
+
+// Opens a file asynchronously. The response returns a file descriptor
+// and an error code from base/platform_file.h.
+IPC_MESSAGE_ROUTED3(ViewHostMsg_AsyncOpenFile,
+ FilePath /* file path */,
+ int /* flags */,
+ int /* message_id */)
+
+//---------------------------------------------------------------------------
+// Request for cryptographic operation messages:
+// These are messages from the renderer to the browser to perform a
+// cryptographic operation.
+
+// Asks the browser process to generate a keypair for grabbing a client
+// certificate from a CA (<keygen> tag), and returns the signed public
+// key and challenge string.
+IPC_SYNC_MESSAGE_CONTROL3_1(ViewHostMsg_Keygen,
+ uint32 /* key size index */,
+ std::string /* challenge string */,
+ GURL /* URL of requestor */,
+ std::string /* signed public key and challenge */)
diff --git a/content/renderer/command_buffer_proxy.cc b/content/renderer/command_buffer_proxy.cc
index 7a5cc74..865f90f 100644
--- a/content/renderer/command_buffer_proxy.cc
+++ b/content/renderer/command_buffer_proxy.cc
@@ -8,10 +8,10 @@
#include "base/process_util.h"
#include "base/shared_memory.h"
#include "base/task.h"
-#include "chrome/common/render_messages.h"
#include "chrome/renderer/render_thread.h"
#include "content/common/gpu_messages.h"
#include "content/common/plugin_messages.h"
+#include "content/common/view_messages.h"
#include "content/renderer/plugin_channel_host.h"
#include "gpu/command_buffer/common/cmd_buffer_common.h"
#include "ui/gfx/size.h"
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index e8446a6..d0debe7 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -431,30 +431,30 @@ static bool IsEditableNode(const WebNode& node) {
static bool WebAccessibilityNotificationToViewHostMsg(
WebAccessibilityNotification notification,
- ViewHostMsg_AccessibilityNotification_Params::NotificationType* type) {
+ ViewHostMsg_AccessibilityNotification_Type::Value* type) {
switch (notification) {
case WebKit::WebAccessibilityNotificationCheckedStateChanged:
- *type = ViewHostMsg_AccessibilityNotification_Params::
+ *type = ViewHostMsg_AccessibilityNotification_Type::
NOTIFICATION_TYPE_CHECK_STATE_CHANGED;
break;
case WebKit::WebAccessibilityNotificationChildrenChanged:
- *type = ViewHostMsg_AccessibilityNotification_Params::
+ *type = ViewHostMsg_AccessibilityNotification_Type::
NOTIFICATION_TYPE_CHILDREN_CHANGED;
break;
case WebKit::WebAccessibilityNotificationFocusedUIElementChanged:
- *type = ViewHostMsg_AccessibilityNotification_Params::
+ *type = ViewHostMsg_AccessibilityNotification_Type::
NOTIFICATION_TYPE_FOCUS_CHANGED;
break;
case WebKit::WebAccessibilityNotificationLoadComplete:
- *type = ViewHostMsg_AccessibilityNotification_Params::
+ *type = ViewHostMsg_AccessibilityNotification_Type::
NOTIFICATION_TYPE_LOAD_COMPLETE;
break;
case WebKit::WebAccessibilityNotificationValueChanged:
- *type = ViewHostMsg_AccessibilityNotification_Params::
+ *type = ViewHostMsg_AccessibilityNotification_Type::
NOTIFICATION_TYPE_VALUE_CHANGED;
break;
case WebKit::WebAccessibilityNotificationSelectedTextChanged:
- *type = ViewHostMsg_AccessibilityNotification_Params::
+ *type = ViewHostMsg_AccessibilityNotification_Type::
NOTIFICATION_TYPE_SELECTED_TEXT_CHANGED;
break;
default:
@@ -4949,7 +4949,7 @@ void RenderView::postAccessibilityNotification(
if (acc_notification.id < 0)
return;
- ViewHostMsg_AccessibilityNotification_Params::NotificationType temp;
+ ViewHostMsg_AccessibilityNotification_Type::Value temp;
if (!WebAccessibilityNotificationToViewHostMsg(notification, &temp))
return;
diff --git a/content/renderer/renderer_webkitclient_impl.cc b/content/renderer/renderer_webkitclient_impl.cc
index 48850d2..c904137 100644
--- a/content/renderer/renderer_webkitclient_impl.cc
+++ b/content/renderer/renderer_webkitclient_impl.cc
@@ -6,6 +6,7 @@
#include "base/command_line.h"
#include "base/file_path.h"
+#include "base/file_util.h"
#include "base/platform_file.h"
#include "base/shared_memory.h"
#include "base/utf_string_conversions.h"
generated by cgit v1.1 at 2025-02-13 15:03:50 +0000