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

Unified Diff: content/renderer/pepper_plugin_delegate_impl.cc

Issue 7669055: Remove webkit::ppapi::Resource. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nulls auditeed Created 9 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/chrome_ppb_pdf_impl.cc ('k') | ppapi/ppapi_shared.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper_plugin_delegate_impl.cc
diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc
index 0476e532d3c2a168bb128534eac608e5cbcb648d..52d596e95c733a0b6ad1ac0a62e0d44fdc1af4ab 100644
--- a/content/renderer/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper_plugin_delegate_impl.cc
@@ -70,6 +70,7 @@
#include "webkit/plugins/ppapi/ppb_broker_impl.h"
#include "webkit/plugins/ppapi/ppb_flash_impl.h"
#include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
+#include "webkit/plugins/ppapi/resource_helper.h"
#include "webkit/plugins/webplugininfo.h"
using WebKit::WebView;
@@ -626,7 +627,7 @@ void PpapiBrokerImpl::ConnectPluginToBroker(
scoped_ptr<base::SyncSocket> broker_socket(sockets[0]);
scoped_ptr<base::SyncSocket> plugin_socket(sockets[1]);
- result = dispatcher_->SendHandleToBroker(client->instance()->pp_instance(),
+ result = dispatcher_->SendHandleToBroker(client->pp_instance(),
broker_socket->handle());
// If the broker has its pipe handle, duplicate the plugin's handle.
@@ -962,7 +963,8 @@ PepperPluginDelegateImpl::ConnectToPpapiBroker(
// before Connect() adds a reference.
scoped_refptr<PpapiBrokerImpl> broker_impl;
- webkit::ppapi::PluginModule* plugin_module = client->instance()->module();
+ webkit::ppapi::PluginModule* plugin_module =
+ webkit::ppapi::ResourceHelper::GetPluginModule(client);
PpapiBroker* broker = plugin_module->GetBroker();
if (!broker) {
broker_impl = CreatePpapiBroker(plugin_module);
« no previous file with comments | « chrome/renderer/chrome_ppb_pdf_impl.cc ('k') | ppapi/ppapi_shared.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698