Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Side by Side Diff: content/renderer/pepper/pepper_plugin_delegate_impl.cc

Issue 9917002: IPC: change sync channel dispatch restriction to allow dispatch to other channels within the same "… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: docs Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h" 5 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <cstddef> 8 #include <cstddef>
9 #include <map> 9 #include <map>
10 #include <queue> 10 #include <queue>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "content/renderer/pepper/pepper_platform_audio_input_impl.h" 45 #include "content/renderer/pepper/pepper_platform_audio_input_impl.h"
46 #include "content/renderer/pepper/pepper_platform_audio_output_impl.h" 46 #include "content/renderer/pepper/pepper_platform_audio_output_impl.h"
47 #include "content/renderer/pepper/pepper_platform_context_3d_impl.h" 47 #include "content/renderer/pepper/pepper_platform_context_3d_impl.h"
48 #include "content/renderer/pepper/pepper_platform_image_2d_impl.h" 48 #include "content/renderer/pepper/pepper_platform_image_2d_impl.h"
49 #include "content/renderer/pepper/pepper_platform_video_capture_impl.h" 49 #include "content/renderer/pepper/pepper_platform_video_capture_impl.h"
50 #include "content/renderer/pepper/pepper_proxy_channel_delegate_impl.h" 50 #include "content/renderer/pepper/pepper_proxy_channel_delegate_impl.h"
51 #include "content/renderer/render_thread_impl.h" 51 #include "content/renderer/render_thread_impl.h"
52 #include "content/renderer/render_view_impl.h" 52 #include "content/renderer/render_view_impl.h"
53 #include "content/renderer/render_widget_fullscreen_pepper.h" 53 #include "content/renderer/render_widget_fullscreen_pepper.h"
54 #include "content/renderer/renderer_clipboard_client.h" 54 #include "content/renderer/renderer_clipboard_client.h"
55 #include "content/renderer/renderer_restrict_dispatch_group.h"
55 #include "content/renderer/webplugin_delegate_proxy.h" 56 #include "content/renderer/webplugin_delegate_proxy.h"
56 #include "ipc/ipc_channel_handle.h" 57 #include "ipc/ipc_channel_handle.h"
57 #include "media/video/capture/video_capture_proxy.h" 58 #include "media/video/capture/video_capture_proxy.h"
58 #include "ppapi/c/dev/pp_video_dev.h" 59 #include "ppapi/c/dev/pp_video_dev.h"
59 #include "ppapi/c/pp_errors.h" 60 #include "ppapi/c/pp_errors.h"
60 #include "ppapi/c/private/ppb_flash.h" 61 #include "ppapi/c/private/ppb_flash.h"
61 #include "ppapi/proxy/host_dispatcher.h" 62 #include "ppapi/proxy/host_dispatcher.h"
62 #include "ppapi/proxy/ppapi_messages.h" 63 #include "ppapi/proxy/ppapi_messages.h"
63 #include "ppapi/shared_impl/platform_file.h" 64 #include "ppapi/shared_impl/platform_file.h"
64 #include "ppapi/shared_impl/ppapi_preferences.h" 65 #include "ppapi/shared_impl/ppapi_preferences.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 plugin_process_handle, pp_module, local_get_interface)); 119 plugin_process_handle, pp_module, local_get_interface));
119 120
120 if (!dispatcher_->InitHostWithChannel(dispatcher_delegate_.get(), 121 if (!dispatcher_->InitHostWithChannel(dispatcher_delegate_.get(),
121 channel_handle, 122 channel_handle,
122 true, // Client. 123 true, // Client.
123 preferences)) { 124 preferences)) {
124 dispatcher_.reset(); 125 dispatcher_.reset();
125 dispatcher_delegate_.reset(); 126 dispatcher_delegate_.reset();
126 return false; 127 return false;
127 } 128 }
128 dispatcher_->channel()->SetRestrictDispatchToSameChannel(true); 129 dispatcher_->channel()->SetRestrictDispatchChannelGroup(
130 content::kRendererRestrictDispatchGroup_Pepper);
129 return true; 131 return true;
130 } 132 }
131 133
132 // OutOfProcessProxy implementation. 134 // OutOfProcessProxy implementation.
133 virtual const void* GetProxiedInterface(const char* name) { 135 virtual const void* GetProxiedInterface(const char* name) {
134 return dispatcher_->GetProxiedInterface(name); 136 return dispatcher_->GetProxiedInterface(name);
135 } 137 }
136 virtual void AddInstance(PP_Instance instance) { 138 virtual void AddInstance(PP_Instance instance) {
137 ppapi::proxy::HostDispatcher::SetForInstance(instance, dispatcher_.get()); 139 ppapi::proxy::HostDispatcher::SetForInstance(instance, dispatcher_.get());
138 } 140 }
(...skipping 1459 matching lines...) Expand 10 before | Expand all | Expand 10 after
1598 render_view_->mouse_lock_dispatcher()->OnLockTargetDestroyed(target); 1600 render_view_->mouse_lock_dispatcher()->OnLockTargetDestroyed(target);
1599 delete target; 1601 delete target;
1600 mouse_lock_instances_.erase(it); 1602 mouse_lock_instances_.erase(it);
1601 } 1603 }
1602 } 1604 }
1603 1605
1604 webkit_glue::ClipboardClient* 1606 webkit_glue::ClipboardClient*
1605 PepperPluginDelegateImpl::CreateClipboardClient() const { 1607 PepperPluginDelegateImpl::CreateClipboardClient() const {
1606 return new RendererClipboardClient; 1608 return new RendererClipboardClient;
1607 } 1609 }
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_broker_impl.cc ('k') | content/renderer/renderer_restrict_dispatch_group.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698