diff options
Diffstat (limited to 'content')
49 files changed, 227 insertions, 196 deletions
diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc index 6a2218f..a4f339c 100644 --- a/content/browser/browser_child_process_host_impl.cc +++ b/content/browser/browser_child_process_host_impl.cc @@ -21,7 +21,6 @@ #include "content/browser/profiler_message_filter.h" #include "content/browser/tracing/trace_message_filter.h" #include "content/common/child_process_host_impl.h" -#include "content/common/plugin_messages.h" #include "content/public/browser/browser_child_process_host_delegate.h" #include "content/public/browser/browser_child_process_observer.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc index e1efc1f..de320b7 100644 --- a/content/browser/plugin_data_remover_impl.cc +++ b/content/browser/plugin_data_remover_impl.cc @@ -16,7 +16,7 @@ #include "content/browser/plugin_service_impl.h" #include "content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h" #include "content/common/child_process_host_impl.h" -#include "content/common/plugin_messages.h" +#include "content/common/plugin_process_messages.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/pepper_plugin_info.h" @@ -177,7 +177,7 @@ class PluginDataRemoverImpl::Context // IPC::Listener methods. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { IPC_BEGIN_MESSAGE_MAP(Context, message) - IPC_MESSAGE_HANDLER(PluginHostMsg_ClearSiteDataResult, + IPC_MESSAGE_HANDLER(PluginProcessHostMsg_ClearSiteDataResult, OnClearSiteDataResult) IPC_MESSAGE_HANDLER(PpapiHostMsg_ClearSiteDataResult, OnPpapiClearSiteDataResult) @@ -243,7 +243,8 @@ class PluginDataRemoverImpl::Context if (is_ppapi) { msg = CreatePpapiClearSiteDataMsg(max_age); } else { - msg = new PluginMsg_ClearSiteData(std::string(), kClearAllData, max_age); + msg = new PluginProcessMsg_ClearSiteData( + std::string(), kClearAllData, max_age); } if (!channel_->Send(msg)) { NOTREACHED() << "Couldn't send ClearSiteData message"; @@ -253,13 +254,13 @@ class PluginDataRemoverImpl::Context } // Handles the PpapiHostMsg_ClearSiteDataResult message by delegating to the - // PluginHostMsg_ClearSiteDataResult handler. + // PluginProcessHostMsg_ClearSiteDataResult handler. void OnPpapiClearSiteDataResult(uint32 request_id, bool success) { DCHECK_EQ(0u, request_id); OnClearSiteDataResult(success); } - // Handles the PluginHostMsg_ClearSiteDataResult message. + // Handles the PluginProcessHostMsg_ClearSiteDataResult message. void OnClearSiteDataResult(bool success) { LOG_IF(ERROR, !success) << "ClearSiteData returned error"; UMA_HISTOGRAM_TIMES("ClearPluginData.time", diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index cce088f..7b0c258 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -25,7 +25,7 @@ #include "content/browser/gpu/gpu_data_manager_impl.h" #include "content/browser/plugin_service_impl.h" #include "content/common/child_process_host_impl.h" -#include "content/common/plugin_messages.h" +#include "content/common/plugin_process_messages.h" #include "content/common/resource_messages.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" diff --git a/content/browser/plugin_process_host_mac.cc b/content/browser/plugin_process_host_mac.cc index 5c7916a..f283ecd 100644 --- a/content/browser/plugin_process_host_mac.cc +++ b/content/browser/plugin_process_host_mac.cc @@ -14,7 +14,6 @@ #include "base/process_util.h" #include "content/browser/browser_child_process_host_impl.h" #include "content/browser/plugin_process_host.h" -#include "content/common/plugin_messages.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_data.h" #include "ui/gfx/rect.h" diff --git a/content/browser/renderer_host/java/DEPS b/content/browser/renderer_host/java/DEPS new file mode 100644 index 0000000..6866a15 --- /dev/null +++ b/content/browser/renderer_host/java/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+content/common_child", # For java bridge bindings +] diff --git a/content/browser/renderer_host/java/java_bridge_channel_host.h b/content/browser/renderer_host/java/java_bridge_channel_host.h index 4c58f8d..2e8968b 100644 --- a/content/browser/renderer_host/java/java_bridge_channel_host.h +++ b/content/browser/renderer_host/java/java_bridge_channel_host.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_ #define CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_ -#include "content/common/np_channel_base.h" +#include "content/common_child/np_channel_base.h" namespace content { diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc index e3d2cd2..a1f1624 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc @@ -11,8 +11,8 @@ #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/common/child_process.h" #include "content/common/java_bridge_messages.h" -#include "content/common/npobject_stub.h" -#include "content/common/npobject_util.h" // For CreateNPVariantParam() +#include "content/common_child/npobject_stub.h" +#include "content/common_child/npobject_util.h" // For CreateNPVariantParam() #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h b/content/browser/renderer_host/java/java_bridge_dispatcher_host.h index a0bc341..2f0c5f6 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" -#include "content/common/npobject_stub.h" +#include "content/common_child/npobject_stub.h" #include "content/public/browser/render_view_host_observer.h" class RouteIDGenerator; diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index e99db47..14bcd88 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -33,7 +33,6 @@ #include "content/common/edit_command.h" #include "content/common/gpu/gpu_messages.h" #include "content/common/input_messages.h" -#include "content/common/plugin_messages.h" #include "content/common/view_messages.h" #include "content/port/browser/render_widget_host_view_frame_subscriber.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index 000e532..2437396 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -6,12 +6,12 @@ #include <dwmapi.h> #include <InputScope.h> +#include <wtsapi32.h> +#pragma comment(lib, "wtsapi32.lib") #include <algorithm> #include <map> #include <stack> -#include <wtsapi32.h> -#pragma comment(lib, "wtsapi32.lib") #include "base/bind.h" #include "base/bind_helpers.h" @@ -40,7 +40,6 @@ #include "content/browser/renderer_host/ui_events_helper.h" #include "content/common/accessibility_messages.h" #include "content/common/gpu/gpu_messages.h" -#include "content/common/plugin_messages.h" #include "content/common/view_messages.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_data.h" @@ -52,11 +51,11 @@ #include "content/public/common/page_zoom.h" #include "content/public/common/process_type.h" #include "skia/ext/skia_utils_win.h" -#include "third_party/skia/include/core/SkRegion.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h" #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFactory.h" +#include "third_party/skia/include/core/SkRegion.h" #include "ui/base/events/event.h" #include "ui/base/events/event_utils.h" #include "ui/base/ime/composition_text.h" diff --git a/content/common/DEPS b/content/common/DEPS index 748b217..11a3ffc 100644 --- a/content/common/DEPS +++ b/content/common/DEPS @@ -6,3 +6,10 @@ include_rules = [ "-webkit/browser", "-webkit/renderer", ] + +specific_include_rules = { +# Java bridge code passes NPAPI types to the browser process. Crazy! + "java_bridge_messages\.h": [ + "+content/common_child" + ] +} diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h index fd050ef..de5adbd 100644 --- a/content/common/content_message_generator.h +++ b/content/common/content_message_generator.h @@ -41,6 +41,7 @@ #include "content/common/mime_registry_messages.h" #include "content/common/p2p_messages.h" #include "content/common/pepper_messages.h" +#include "content/common/plugin_process_messages.h" #include "content/common/quota_messages.h" #include "content/common/resource_messages.h" #include "content/common/socket_stream_messages.h" diff --git a/content/common/gpu/client/command_buffer_proxy_impl.cc b/content/common/gpu/client/command_buffer_proxy_impl.cc index 01cc76e..4d918c6 100644 --- a/content/common/gpu/client/command_buffer_proxy_impl.cc +++ b/content/common/gpu/client/command_buffer_proxy_impl.cc @@ -11,11 +11,10 @@ #include "base/shared_memory.h" #include "base/stl_util.h" #include "content/common/child_process_messages.h" -#include "content/common/gpu/gpu_memory_allocation.h" #include "content/common/gpu/client/gpu_channel_host.h" #include "content/common/gpu/client/gpu_video_decode_accelerator_host.h" +#include "content/common/gpu/gpu_memory_allocation.h" #include "content/common/gpu/gpu_messages.h" -#include "content/common/plugin_messages.h" #include "content/common/view_messages.h" #include "gpu/command_buffer/common/cmd_buffer_common.h" #include "gpu/command_buffer/common/command_buffer_shared.h" diff --git a/content/common/java_bridge_messages.h b/content/common/java_bridge_messages.h index 282cebc..804c572 100644 --- a/content/common/java_bridge_messages.h +++ b/content/common/java_bridge_messages.h @@ -8,7 +8,7 @@ #if defined(ENABLE_JAVA_BRIDGE) -#include "content/common/plugin_param_traits.h" +#include "content/common_child/plugin_param_traits.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message_macros.h" diff --git a/content/common/plugin_process_messages.h b/content/common/plugin_process_messages.h new file mode 100644 index 0000000..6e6ec8a --- /dev/null +++ b/content/common/plugin_process_messages.h @@ -0,0 +1,99 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +// +// Multiply-included message file, hence no include guard. + +#include "build/build_config.h" +#include "content/common/content_export.h" +#include "content/common/content_param_traits.h" +#include "content/public/common/common_param_traits.h" +#include "ipc/ipc_channel_handle.h" +#include "ipc/ipc_message_macros.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/rect.h" + +#undef IPC_MESSAGE_EXPORT +#define IPC_MESSAGE_EXPORT CONTENT_EXPORT + +#define IPC_MESSAGE_START PluginProcessMsgStart + +//----------------------------------------------------------------------------- +// PluginProcess messages +// These are messages sent from the browser to the plugin process. +// Tells the plugin process to create a new channel for communication with a +// given renderer. The channel name is returned in a +// PluginProcessHostMsg_ChannelCreated message. The renderer ID is passed so +// that the plugin process reuses an existing channel to that process if it +// exists. This ID is a unique opaque identifier generated by the browser +// process. +IPC_MESSAGE_CONTROL2(PluginProcessMsg_CreateChannel, + int /* renderer_id */, + bool /* off_the_record */) + +// Tells the plugin process to notify every connected renderer of the pending +// shutdown, so we don't mistake it for a crash. +IPC_MESSAGE_CONTROL0(PluginProcessMsg_NotifyRenderersOfPendingShutdown) + +IPC_MESSAGE_CONTROL3(PluginProcessMsg_ClearSiteData, + std::string /* site */, + uint64 /* flags */, + uint64 /* max_age */) + + +//----------------------------------------------------------------------------- +// PluginProcessHost messages +// These are messages sent from the plugin process to the browser process. +// Response to a PluginProcessMsg_CreateChannel message. +IPC_MESSAGE_CONTROL1(PluginProcessHostMsg_ChannelCreated, + IPC::ChannelHandle /* channel_handle */) + +IPC_MESSAGE_CONTROL1(PluginProcessHostMsg_ClearSiteDataResult, + bool /* success */) + +#if defined(OS_WIN) +// Destroys the given window's parent on the UI thread. +IPC_MESSAGE_CONTROL2(PluginProcessHostMsg_PluginWindowDestroyed, + HWND /* window */, + HWND /* parent */) +#endif + +#if defined(USE_X11) +// On X11, the mapping between NativeViewId and X window ids +// is known only to the browser. This message lets the plugin process +// ask about a NativeViewId that was provided by the renderer. +// It will get 0 back if it's a bogus input. +IPC_SYNC_MESSAGE_CONTROL1_1(PluginProcessHostMsg_MapNativeViewId, + gfx::NativeViewId /* input: native view id */, + gfx::PluginWindowHandle /* output: X window id */) +#endif + +#if defined(OS_MACOSX) +// On Mac OS X, we need the browser to keep track of plugin windows so +// that it can add and remove them from stacking groups, hide and show the +// menu bar, etc. We pass the window rect for convenience so that the +// browser can easily tell if the window is fullscreen. + +// Notifies the browser that the plugin has selected a window (i.e., brought +// it to the front and wants it to have keyboard focus). +IPC_MESSAGE_CONTROL3(PluginProcessHostMsg_PluginSelectWindow, + uint32 /* window ID */, + gfx::Rect /* window rect */, + bool /* modal */) + +// Notifies the browser that the plugin has shown a window. +IPC_MESSAGE_CONTROL3(PluginProcessHostMsg_PluginShowWindow, + uint32 /* window ID */, + gfx::Rect /* window rect */, + bool /* modal */) + +// Notifies the browser that the plugin has hidden a window. +IPC_MESSAGE_CONTROL2(PluginProcessHostMsg_PluginHideWindow, + uint32 /* window ID */, + gfx::Rect /* window rect */) + +// Notifies the browser that a plugin instance has requested a cursor +// visibility change. +IPC_MESSAGE_CONTROL1(PluginProcessHostMsg_PluginSetCursorVisibility, + bool /* cursor visibility */) +#endif diff --git a/content/common/np_channel_base.cc b/content/common_child/np_channel_base.cc index a1a2338..328241c 100644 --- a/content/common/np_channel_base.cc +++ b/content/common_child/np_channel_base.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/np_channel_base.h" +#include "content/common_child/np_channel_base.h" #include <stack> diff --git a/content/common/np_channel_base.h b/content/common_child/np_channel_base.h index f307e9f..d5352f3 100644 --- a/content/common/np_channel_base.h +++ b/content/common_child/np_channel_base.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_COMMON_NP_CHANNEL_BASE_H_ -#define CONTENT_COMMON_NP_CHANNEL_BASE_H_ +#ifndef CONTENT_COMMON_CHILD_NP_CHANNEL_BASE_H_ +#define CONTENT_COMMON_CHILD_NP_CHANNEL_BASE_H_ #include <string> @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/process.h" #include "content/common/message_router.h" -#include "content/common/npobject_base.h" +#include "content/common_child/npobject_base.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_sync_channel.h" @@ -200,4 +200,4 @@ class NPChannelBase : public IPC::Listener, } // namespace content -#endif // CONTENT_COMMON_NP_CHANNEL_BASE_H_ +#endif // CONTENT_COMMON_CHILD_NP_CHANNEL_BASE_H_ diff --git a/content/common/npobject_base.h b/content/common_child/npobject_base.h index f91a847..0dcb04c 100644 --- a/content/common/npobject_base.h +++ b/content/common_child/npobject_base.h @@ -5,8 +5,8 @@ // Base interface used by NPChannelBase and implemented by NPObjectProxy and // NPObjectStub. -#ifndef CONTENT_COMMON_NPOBJECT_BASE_H_ -#define CONTENT_COMMON_NPOBJECT_BASE_H_ +#ifndef CONTENT_COMMON_CHILD_NPOBJECT_BASE_H_ +#define CONTENT_COMMON_CHILD_NPOBJECT_BASE_H_ #include "ipc/ipc_listener.h" #include "third_party/npapi/bindings/npruntime.h" @@ -28,4 +28,4 @@ class NPObjectBase { } // namespace content -#endif // CONTENT_COMMON_NPOBJECT_BASE_H_ +#endif // CONTENT_COMMON_CHILD_NPOBJECT_BASE_H_ diff --git a/content/common/npobject_proxy.cc b/content/common_child/npobject_proxy.cc index eb01acb..7065607 100644 --- a/content/common/npobject_proxy.cc +++ b/content/common_child/npobject_proxy.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/npobject_proxy.h" +#include "content/common_child/npobject_proxy.h" -#include "content/common/np_channel_base.h" -#include "content/common/npobject_util.h" -#include "content/common/plugin_messages.h" +#include "content/common_child/np_channel_base.h" +#include "content/common_child/npobject_util.h" +#include "content/common_child/plugin_messages.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/plugins/npapi/plugin_instance.h" #include "webkit/plugins/npapi/plugin_host.h" +#include "webkit/plugins/npapi/plugin_instance.h" using WebKit::WebBindings; diff --git a/content/common/npobject_proxy.h b/content/common_child/npobject_proxy.h index f280a12..cc98138 100644 --- a/content/common/npobject_proxy.h +++ b/content/common_child/npobject_proxy.h @@ -5,11 +5,11 @@ // A proxy for NPObject that sends all calls to the object to an NPObjectStub // running in a different process. -#ifndef CONTENT_COMMON_NPOBJECT_PROXY_H_ -#define CONTENT_COMMON_NPOBJECT_PROXY_H_ +#ifndef CONTENT_COMMON_CHILD_NPOBJECT_PROXY_H_ +#define CONTENT_COMMON_CHILD_NPOBJECT_PROXY_H_ #include "base/memory/ref_counted.h" -#include "content/common/npobject_base.h" +#include "content/common_child/npobject_base.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" @@ -124,4 +124,4 @@ class NPObjectProxy : public IPC::Listener, } // namespace content -#endif // CONTENT_COMMON_NPOBJECT_PROXY_H_ +#endif // CONTENT_COMMON_CHILD_NPOBJECT_PROXY_H_ diff --git a/content/common/npobject_stub.cc b/content/common_child/npobject_stub.cc index 0e677ee..d72a546 100644 --- a/content/common/npobject_stub.cc +++ b/content/common_child/npobject_stub.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/npobject_stub.h" +#include "content/common_child/npobject_stub.h" -#include "content/common/np_channel_base.h" -#include "content/common/npobject_util.h" -#include "content/common/plugin_messages.h" +#include "content/common_child/np_channel_base.h" +#include "content/common_child/npobject_util.h" +#include "content/common_child/plugin_messages.h" #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "webkit/plugins/npapi/plugin_host.h" #if defined(OS_WIN) diff --git a/content/common/npobject_stub.h b/content/common_child/npobject_stub.h index 46853df..ba46255 100644 --- a/content/common/npobject_stub.h +++ b/content/common_child/npobject_stub.h @@ -5,14 +5,14 @@ // A class that receives IPC messages from an NPObjectProxy and calls the real // NPObject. -#ifndef CONTENT_COMMON_NPOBJECT_STUB_H_ -#define CONTENT_COMMON_NPOBJECT_STUB_H_ +#ifndef CONTENT_COMMON_CHILD_NPOBJECT_STUB_H_ +#define CONTENT_COMMON_CHILD_NPOBJECT_STUB_H_ #include <vector> #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "content/common/npobject_base.h" +#include "content/common_child/npobject_base.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" @@ -96,4 +96,4 @@ class NPObjectStub : public IPC::Listener, } // namespace content -#endif // CONTENT_COMMON_NPOBJECT_STUB_H_ +#endif // CONTENT_COMMON_CHILD_NPOBJECT_STUB_H_ diff --git a/content/common/npobject_util.cc b/content/common_child/npobject_util.cc index a5094a2..8fce7ad 100644 --- a/content/common/npobject_util.cc +++ b/content/common_child/npobject_util.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/npobject_util.h" +#include "content/common_child/npobject_util.h" #include "base/string_util.h" -#include "content/common/np_channel_base.h" -#include "content/common/npobject_proxy.h" -#include "content/common/plugin_messages.h" -#include "third_party/npapi/bindings/nphostapi.h" +#include "content/common_child/np_channel_base.h" +#include "content/common_child/npobject_proxy.h" +#include "content/common_child/plugin_messages.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "webkit/plugins/npapi/plugin_host.h" +#include "third_party/npapi/bindings/nphostapi.h" #include "webkit/glue/webkit_glue.h" +#include "webkit/plugins/npapi/plugin_host.h" using WebKit::WebBindings; diff --git a/content/common/npobject_util.h b/content/common_child/npobject_util.h index 0890ce80..7590c60 100644 --- a/content/common/npobject_util.h +++ b/content/common_child/npobject_util.h @@ -4,8 +4,8 @@ // // Helper functions that are used by the NPObject proxy and stub. -#ifndef CONTENT_COMMON_NPOBJECT_UTIL_H_ -#define CONTENT_COMMON_NPOBJECT_UTIL_H_ +#ifndef CONTENT_COMMON_CHILD_NPOBJECT_UTIL_H_ +#define CONTENT_COMMON_CHILD_NPOBJECT_UTIL_H_ #include "build/build_config.h" @@ -13,7 +13,7 @@ #include <windows.h> #endif -#include "content/common/npobject_stub.h" +#include "content/common_child/npobject_stub.h" class GURL; @@ -71,4 +71,4 @@ HANDLE GetMessageBoxEvent(HWND hwnd); } // namespace content -#endif // CONTENT_COMMON_NPOBJECT_UTIL_H_ +#endif // CONTENT_COMMON_CHILD_NPOBJECT_UTIL_H_ diff --git a/content/common/plugin_message_generator.cc b/content/common_child/plugin_message_generator.cc index b44b164..c8a7aae 100644 --- a/content/common/plugin_message_generator.cc +++ b/content/common_child/plugin_message_generator.cc @@ -4,30 +4,30 @@ // Get basic type definitions. #define IPC_MESSAGE_IMPL -#include "content/common/plugin_message_generator.h" +#include "content/common_child/plugin_message_generator.h" // Generate constructors. #include "ipc/struct_constructor_macros.h" -#include "content/common/plugin_message_generator.h" +#include "content/common_child/plugin_message_generator.h" // Generate destructors. #include "ipc/struct_destructor_macros.h" -#include "content/common/plugin_message_generator.h" +#include "content/common_child/plugin_message_generator.h" // Generate param traits write methods. #include "ipc/param_traits_write_macros.h" namespace IPC { -#include "content/common/plugin_message_generator.h" +#include "content/common_child/plugin_message_generator.h" } // namespace IPC // Generate param traits read methods. #include "ipc/param_traits_read_macros.h" namespace IPC { -#include "content/common/plugin_message_generator.h" +#include "content/common_child/plugin_message_generator.h" } // namespace IPC // Generate param traits log methods. #include "ipc/param_traits_log_macros.h" namespace IPC { -#include "content/common/plugin_message_generator.h" +#include "content/common_child/plugin_message_generator.h" } // namespace IPC diff --git a/content/common/plugin_message_generator.h b/content/common_child/plugin_message_generator.h index 985290f..f79e19e 100644 --- a/content/common/plugin_message_generator.h +++ b/content/common_child/plugin_message_generator.h @@ -4,4 +4,4 @@ // Multiply-included file, hence no include guard. -#include "content/common/plugin_messages.h" +#include "content/common_child/plugin_messages.h" diff --git a/content/common/plugin_messages.h b/content/common_child/plugin_messages.h index 2fa0883..d82bc72 100644 --- a/content/common/plugin_messages.h +++ b/content/common_child/plugin_messages.h @@ -7,7 +7,7 @@ #include "build/build_config.h" #include "content/common/content_export.h" #include "content/common/content_param_traits.h" -#include "content/common/plugin_param_traits.h" +#include "content/common_child/plugin_param_traits.h" #include "content/public/common/common_param_traits.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message_macros.h" @@ -61,79 +61,6 @@ IPC_STRUCT_BEGIN(PluginMsg_UpdateGeometry_Param) IPC_STRUCT_END() //----------------------------------------------------------------------------- -// PluginProcess messages -// These are messages sent from the browser to the plugin process. -// Tells the plugin process to create a new channel for communication with a -// given renderer. The channel name is returned in a -// PluginProcessHostMsg_ChannelCreated message. The renderer ID is passed so -// that the plugin process reuses an existing channel to that process if it -// exists. This ID is a unique opaque identifier generated by the browser -// process. -IPC_MESSAGE_CONTROL2(PluginProcessMsg_CreateChannel, - int /* renderer_id */, - bool /* off_the_record */) - -// Tells the plugin process to notify every connected renderer of the pending -// shutdown, so we don't mistake it for a crash. -IPC_MESSAGE_CONTROL0(PluginProcessMsg_NotifyRenderersOfPendingShutdown) - - -//----------------------------------------------------------------------------- -// PluginProcessHost messages -// These are messages sent from the plugin process to the browser process. -// Response to a PluginProcessMsg_CreateChannel message. -IPC_MESSAGE_CONTROL1(PluginProcessHostMsg_ChannelCreated, - IPC::ChannelHandle /* channel_handle */) - -#if defined(OS_WIN) -// Destroys the given window's parent on the UI thread. -IPC_MESSAGE_CONTROL2(PluginProcessHostMsg_PluginWindowDestroyed, - HWND /* window */, - HWND /* parent */) -#endif - -#if defined(USE_X11) -// On X11, the mapping between NativeViewId and X window ids -// is known only to the browser. This message lets the plugin process -// ask about a NativeViewId that was provided by the renderer. -// It will get 0 back if it's a bogus input. -IPC_SYNC_MESSAGE_CONTROL1_1(PluginProcessHostMsg_MapNativeViewId, - gfx::NativeViewId /* input: native view id */, - gfx::PluginWindowHandle /* output: X window id */) -#endif - -#if defined(OS_MACOSX) -// On Mac OS X, we need the browser to keep track of plugin windows so -// that it can add and remove them from stacking groups, hide and show the -// menu bar, etc. We pass the window rect for convenience so that the -// browser can easily tell if the window is fullscreen. - -// Notifies the browser that the plugin has selected a window (i.e., brought -// it to the front and wants it to have keyboard focus). -IPC_MESSAGE_CONTROL3(PluginProcessHostMsg_PluginSelectWindow, - uint32 /* window ID */, - gfx::Rect /* window rect */, - bool /* modal */) - -// Notifies the browser that the plugin has shown a window. -IPC_MESSAGE_CONTROL3(PluginProcessHostMsg_PluginShowWindow, - uint32 /* window ID */, - gfx::Rect /* window rect */, - bool /* modal */) - -// Notifies the browser that the plugin has hidden a window. -IPC_MESSAGE_CONTROL2(PluginProcessHostMsg_PluginHideWindow, - uint32 /* window ID */, - gfx::Rect /* window rect */) - -// Notifies the browser that a plugin instance has requested a cursor -// visibility change. -IPC_MESSAGE_CONTROL1(PluginProcessHostMsg_PluginSetCursorVisibility, - bool /* cursor visibility */) -#endif - - -//----------------------------------------------------------------------------- // Plugin messages // These are messages sent from the renderer process to the plugin process. // Tells the plugin process to create a new plugin instance with the given @@ -287,11 +214,6 @@ IPC_MESSAGE_ROUTED1(PluginMsg_SetFakeAcceleratedSurfaceWindowHandle, gfx::PluginWindowHandle /* window */) #endif -IPC_MESSAGE_CONTROL3(PluginMsg_ClearSiteData, - std::string /* site */, - uint64 /* flags */, - uint64 /* max_age */) - //----------------------------------------------------------------------------- // PluginHost messages // These are messages sent from the plugin process to the renderer process. @@ -400,9 +322,6 @@ IPC_MESSAGE_ROUTED3(PluginHostMsg_AcceleratedPluginAllocatedIOSurface, IPC_MESSAGE_ROUTED0(PluginHostMsg_AcceleratedPluginSwappedIOSurface) #endif -IPC_MESSAGE_CONTROL1(PluginHostMsg_ClearSiteDataResult, - bool /* success */) - IPC_MESSAGE_ROUTED2(PluginHostMsg_URLRedirectResponse, bool /* allow */, int /* resource_id */) diff --git a/content/common/plugin_param_traits.cc b/content/common_child/plugin_param_traits.cc index 0aec10d..a60255d 100644 --- a/content/common/plugin_param_traits.cc +++ b/content/common_child/plugin_param_traits.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/plugin_param_traits.h" +#include "content/common_child/plugin_param_traits.h" #include "base/strings/string_number_conversions.h" #include "ipc/ipc_message_utils.h" diff --git a/content/common/plugin_param_traits.h b/content/common_child/plugin_param_traits.h index bd616f3..15061a6 100644 --- a/content/common/plugin_param_traits.h +++ b/content/common_child/plugin_param_traits.h @@ -11,8 +11,8 @@ // public members, or because the same type is being used in multiple // *_messages.h headers. -#ifndef CONTENT_COMMON_PLUGIN_PARAM_TRAITS_H_ -#define CONTENT_COMMON_PLUGIN_PARAM_TRAITS_H_ +#ifndef CONTENT_COMMON_CHILD_PLUGIN_PARAM_TRAITS_H_ +#define CONTENT_COMMON_CHILD_PLUGIN_PARAM_TRAITS_H_ #include <string> #include "ipc/ipc_message.h" diff --git a/content/content.gyp b/content/content.gyp index 27ddd02..991fb40 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -48,7 +48,7 @@ 'dependencies': [ 'content_app', 'content_browser', - 'content_common_plugin', + 'content_common_child', 'content_common', ], 'conditions': [ @@ -100,7 +100,7 @@ }], ['java_bridge==1', { 'dependencies': [ - 'content_common_plugin', + 'content_common_child', ] }] ], @@ -123,11 +123,11 @@ 'msvs_disabled_warnings': [ 4267, ], }, { - 'target_name': 'content_common_plugin', + 'target_name': 'content_common_child', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, 'includes': [ - 'content_common_plugin.gypi', + 'content_common_child.gypi', ], 'conditions': [ ['OS != "ios"', { @@ -163,7 +163,7 @@ 'content_plugin.gypi', ], 'dependencies': [ - 'content_common_plugin', + 'content_common_child', 'content_common', ], }, @@ -185,7 +185,7 @@ 'content_renderer.gypi', ], 'dependencies': [ - 'content_common_plugin', + 'content_common_child', 'content_common', 'content_resources.gyp:content_resources', ], @@ -216,6 +216,7 @@ 'content_worker.gypi', ], 'dependencies': [ + 'content_common_child', 'content_common', ], }, @@ -247,7 +248,7 @@ 'includes': [ 'content_app.gypi', 'content_browser.gypi', - 'content_common_plugin.gypi', + 'content_common_child.gypi', 'content_common.gypi', 'content_gpu.gypi', 'content_plugin.gypi', @@ -284,7 +285,7 @@ 'msvs_disabled_warnings': [ 4267, ], }, { - 'target_name': 'content_common_plugin', + 'target_name': 'content_common_child', 'type': 'none', 'dependencies': ['content'], }, diff --git a/content/content_common.gypi b/content/content_common.gypi index 6fecdaf..7ac1082 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -314,6 +314,7 @@ 'common/pepper_renderer_instance_data.h', 'common/plugin_carbon_interpose_constants_mac.cc', 'common/plugin_carbon_interpose_constants_mac.h', + 'common/plugin_process_messages.h', 'common/process_type.cc', 'common/quota_messages.h', 'common/quota_dispatcher.cc', diff --git a/content/content_common_plugin.gypi b/content/content_common_child.gypi index 4fcf28c..9bf78a3 100644 --- a/content/content_common_plugin.gypi +++ b/content/content_common_child.gypi @@ -16,20 +16,20 @@ '../base/base.gyp:base', ], 'sources': [ - 'common/np_channel_base.cc', - 'common/np_channel_base.h', - 'common/npobject_base.h', - 'common/npobject_proxy.cc', - 'common/npobject_proxy.h', - 'common/npobject_stub.cc', - 'common/npobject_stub.h', - 'common/npobject_util.cc', - 'common/npobject_util.h', - 'common/plugin_messages.h', - 'common/plugin_param_traits.cc', - 'common/plugin_param_traits.h', - 'common/plugin_message_generator.cc', - 'common/plugin_message_generator.h', + 'common_child/np_channel_base.cc', + 'common_child/np_channel_base.h', + 'common_child/npobject_base.h', + 'common_child/npobject_proxy.cc', + 'common_child/npobject_proxy.h', + 'common_child/npobject_stub.cc', + 'common_child/npobject_stub.h', + 'common_child/npobject_util.cc', + 'common_child/npobject_util.h', + 'common_child/plugin_messages.h', + 'common_child/plugin_param_traits.cc', + 'common_child/plugin_param_traits.h', + 'common_child/plugin_message_generator.cc', + 'common_child/plugin_message_generator.h', ], 'conditions': [ ['OS=="ios"', { diff --git a/content/plugin/DEPS b/content/plugin/DEPS index b8d10ee..90fcc14 100644 --- a/content/plugin/DEPS +++ b/content/plugin/DEPS @@ -1,6 +1,7 @@ include_rules = [ "-chrome", "+content/public/plugin", + "+content/common_child", "+sandbox/win/src", "+skia/ext", "+third_party/npapi", diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc index 781ca00..bc13d39 100644 --- a/content/plugin/plugin_channel.cc +++ b/content/plugin/plugin_channel.cc @@ -12,7 +12,8 @@ #include "base/synchronization/waitable_event.h" #include "build/build_config.h" #include "content/common/child_process.h" -#include "content/common/plugin_messages.h" +#include "content/common/plugin_process_messages.h" +#include "content/common_child/plugin_messages.h" #include "content/public/common/content_switches.h" #include "content/plugin/plugin_thread.h" #include "content/plugin/webplugin_delegate_stub.h" @@ -250,7 +251,7 @@ bool PluginChannel::OnControlMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER_DELAY_REPLY(PluginMsg_DestroyInstance, OnDestroyInstance) IPC_MESSAGE_HANDLER(PluginMsg_GenerateRouteID, OnGenerateRouteID) - IPC_MESSAGE_HANDLER(PluginMsg_ClearSiteData, OnClearSiteData) + IPC_MESSAGE_HANDLER(PluginProcessMsg_ClearSiteData, OnClearSiteData) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() DCHECK(handled); @@ -317,7 +318,7 @@ void PluginChannel::OnClearSiteData(const std::string& site, success = (err == NPERR_NO_ERROR); } } - Send(new PluginHostMsg_ClearSiteDataResult(success)); + Send(new PluginProcessHostMsg_ClearSiteDataResult(success)); } } // namespace content diff --git a/content/plugin/plugin_channel.h b/content/plugin/plugin_channel.h index c717bd6..70b36b7 100644 --- a/content/plugin/plugin_channel.h +++ b/content/plugin/plugin_channel.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_handle.h" #include "base/process.h" #include "build/build_config.h" -#include "content/common/np_channel_base.h" +#include "content/common_child/np_channel_base.h" #include "content/plugin/webplugin_delegate_stub.h" namespace base { diff --git a/content/plugin/plugin_interpose_util_mac.mm b/content/plugin/plugin_interpose_util_mac.mm index f58d1d3..1166e6c 100644 --- a/content/plugin/plugin_interpose_util_mac.mm +++ b/content/plugin/plugin_interpose_util_mac.mm @@ -7,7 +7,7 @@ #import <AppKit/AppKit.h> #import <objc/runtime.h> -#include "content/common/plugin_messages.h" +#include "content/common/plugin_process_messages.h" #include "content/plugin/plugin_thread.h" #include "webkit/plugins/npapi/webplugin_delegate_impl.h" diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc index 27e3f55..623bd88 100644 --- a/content/plugin/plugin_thread.cc +++ b/content/plugin/plugin_thread.cc @@ -21,8 +21,8 @@ #include "base/process_util.h" #include "base/threading/thread_local.h" #include "content/common/child_process.h" -#include "content/common/npobject_util.h" -#include "content/common/plugin_messages.h" +#include "content/common/plugin_process_messages.h" +#include "content/common_child/npobject_util.h" #include "content/public/common/content_switches.h" #include "content/public/plugin/content_plugin_client.h" #include "ipc/ipc_channel_handle.h" diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc index 5c25961..afd5f52 100644 --- a/content/plugin/webplugin_delegate_stub.cc +++ b/content/plugin/webplugin_delegate_stub.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/string_number_conversions.h" -#include "content/common/plugin_messages.h" +#include "content/common_child/plugin_messages.h" #include "content/plugin/plugin_channel.h" #include "content/plugin/plugin_thread.h" #include "content/plugin/webplugin_proxy.h" diff --git a/content/plugin/webplugin_delegate_stub.h b/content/plugin/webplugin_delegate_stub.h index 7be92617..b8a2a66 100644 --- a/content/plugin/webplugin_delegate_stub.h +++ b/content/plugin/webplugin_delegate_stub.h @@ -9,7 +9,7 @@ #include <vector> #include "base/memory/ref_counted.h" -#include "content/common/npobject_stub.h" +#include "content/common_child/npobject_stub.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc index 23a7ec9..f0834d0 100644 --- a/content/plugin/webplugin_proxy.cc +++ b/content/plugin/webplugin_proxy.cc @@ -11,9 +11,9 @@ #include "base/memory/scoped_handle.h" #include "base/shared_memory.h" #include "build/build_config.h" -#include "content/common/npobject_proxy.h" -#include "content/common/npobject_util.h" -#include "content/common/plugin_messages.h" +#include "content/common_child/npobject_proxy.h" +#include "content/common_child/npobject_util.h" +#include "content/common_child/plugin_messages.h" #include "content/plugin/plugin_channel.h" #include "content/plugin/plugin_thread.h" #include "content/public/common/content_client.h" @@ -36,6 +36,7 @@ #endif #if defined(OS_WIN) +#include "content/common/plugin_process_messages.h" #include "content/public/common/sandbox_init.h" #endif diff --git a/content/renderer/DEPS b/content/renderer/DEPS index c556898..664ad70 100644 --- a/content/renderer/DEPS +++ b/content/renderer/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+content/public/renderer", + "+content/common_child", "+jingle/glue", "+media", # For audio input/output and audio/video decoding. "+third_party/hyphen/hyphen.h", diff --git a/content/renderer/java/java_bridge_channel.cc b/content/renderer/java/java_bridge_channel.cc index 6663d55..c783c92 100644 --- a/content/renderer/java/java_bridge_channel.cc +++ b/content/renderer/java/java_bridge_channel.cc @@ -6,7 +6,7 @@ #include "content/common/child_process.h" #include "content/common/java_bridge_messages.h" -#include "content/common/plugin_messages.h" +#include "content/common_child/plugin_messages.h" namespace content { diff --git a/content/renderer/java/java_bridge_channel.h b/content/renderer/java/java_bridge_channel.h index c6bf8d3..0dd2e5a 100644 --- a/content/renderer/java/java_bridge_channel.h +++ b/content/renderer/java/java_bridge_channel.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_JAVA_JAVA_BRIDGE_CHANNEL_H_ #define CONTENT_RENDERER_JAVA_JAVA_BRIDGE_CHANNEL_H_ -#include "content/common/np_channel_base.h" +#include "content/common_child/np_channel_base.h" #include "ipc/ipc_channel_handle.h" namespace content { diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc index 04802df5..6a659c5 100644 --- a/content/renderer/java/java_bridge_dispatcher.cc +++ b/content/renderer/java/java_bridge_dispatcher.cc @@ -6,7 +6,7 @@ #include "content/common/child_process.h" #include "content/common/java_bridge_messages.h" -#include "content/common/npobject_util.h" // For CreateNPVariant() +#include "content/common_child/npobject_util.h" // For CreateNPVariant() #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/renderer/java/java_bridge_channel.h" diff --git a/content/renderer/plugin_channel_host.cc b/content/renderer/plugin_channel_host.cc index f9b1829..b49b093 100644 --- a/content/renderer/plugin_channel_host.cc +++ b/content/renderer/plugin_channel_host.cc @@ -7,8 +7,8 @@ #include "base/metrics/histogram.h" #include "base/time.h" #include "content/common/child_process.h" -#include "content/common/npobject_base.h" -#include "content/common/plugin_messages.h" +#include "content/common_child/npobject_base.h" +#include "content/common_child/plugin_messages.h" #if defined(OS_POSIX) #include "ipc/ipc_channel_posix.h" diff --git a/content/renderer/plugin_channel_host.h b/content/renderer/plugin_channel_host.h index 7ff180b..b91f6d5 100644 --- a/content/renderer/plugin_channel_host.h +++ b/content/renderer/plugin_channel_host.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_PLUGIN_CHANNEL_HOST_H_ #include "base/hash_tables.h" -#include "content/common/np_channel_base.h" +#include "content/common_child/np_channel_base.h" #include "ipc/ipc_channel_handle.h" namespace content { diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index cfeabd1..861bcaa 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -35,12 +35,12 @@ #include "content/common/gpu/gpu_messages.h" #include "content/common/indexed_db/indexed_db_dispatcher.h" #include "content/common/indexed_db/indexed_db_message_filter.h" -#include "content/common/npobject_util.h" -#include "content/common/plugin_messages.h" #include "content/common/resource_dispatcher.h" #include "content/common/resource_messages.h" #include "content/common/view_messages.h" #include "content/common/web_database_observer_impl.h" +#include "content/common_child/npobject_util.h" +#include "content/common_child/plugin_messages.h" #include "content/public/common/content_constants.h" #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" @@ -106,7 +106,7 @@ #else // TODO(port) #include "base/memory/scoped_handle.h" -#include "content/common/np_channel_base.h" +#include "content/common_child/np_channel_base.h" #endif #if defined(OS_POSIX) diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 019bdde..9d8cf16 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -19,10 +19,10 @@ #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" #include "content/common/indexed_db/proxy_webidbfactory_impl.h" #include "content/common/mime_registry_messages.h" -#include "content/common/npobject_util.h" #include "content/common/thread_safe_sender.h" #include "content/common/view_messages.h" #include "content/common/webmessageportchannel_impl.h" +#include "content/common_child/npobject_util.h" #include "content/public/common/content_switches.h" #include "content/public/common/gpu_info.h" #include "content/public/renderer/content_renderer_client.h" diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index 5c58e5b..f4fbe5d 100644 --- a/content/renderer/webplugin_delegate_proxy.cc +++ b/content/renderer/webplugin_delegate_proxy.cc @@ -25,11 +25,11 @@ #include "base/utf_string_conversions.h" #include "base/version.h" #include "content/common/child_process.h" -#include "content/common/npobject_proxy.h" -#include "content/common/npobject_stub.h" -#include "content/common/npobject_util.h" -#include "content/common/plugin_messages.h" #include "content/common/view_messages.h" +#include "content/common_child/npobject_proxy.h" +#include "content/common_child/npobject_stub.h" +#include "content/common_child/npobject_util.h" +#include "content/common_child/plugin_messages.h" #include "content/public/renderer/content_renderer_client.h" #include "content/renderer/plugin_channel_host.h" #include "content/renderer/render_thread_impl.h" |