Index: webkit/plugins/ppapi/ppb_broker_impl.cc |
diff --git a/webkit/plugins/ppapi/ppb_broker_impl.cc b/webkit/plugins/ppapi/ppb_broker_impl.cc |
index 46ff79f49e09e85555c6b44e1400250f81cc68c1..7b7abb95ab681515209d1ff071537017d1e3c47f 100644 |
--- a/webkit/plugins/ppapi/ppb_broker_impl.cc |
+++ b/webkit/plugins/ppapi/ppb_broker_impl.cc |
@@ -7,6 +7,7 @@ |
#include "base/logging.h" |
#include "webkit/plugins/ppapi/common.h" |
#include "webkit/plugins/ppapi/plugin_module.h" |
+#include "webkit/plugins/ppapi/resource_helper.h" |
using ::ppapi::thunk::PPB_Broker_API; |
@@ -31,7 +32,7 @@ int32_t PlatformFileToInt(base::PlatformFile handle) { |
// PPB_Broker_Impl ------------------------------------------------------ |
-PPB_Broker_Impl::PPB_Broker_Impl(PluginInstance* instance) |
+PPB_Broker_Impl::PPB_Broker_Impl(PP_Instance instance) |
: Resource(instance), |
broker_(NULL), |
connect_callback_(), |
@@ -65,15 +66,17 @@ int32_t PPB_Broker_Impl::Connect(PP_CompletionCallback connect_callback) { |
return PP_ERROR_FAILED; |
} |
+ PluginInstance* instance = ResourceHelper::GetPluginInstance(this); |
viettrungluu
2011/08/22 23:19:47
Maybe we should use plugin_instance for PluginInst
|
+ |
// The callback must be populated now in case we are connected to the broker |
// and BrokerConnected is called before ConnectToPpapiBroker returns. |
// Because it must be created now, it must be aborted and cleared if |
// ConnectToPpapiBroker fails. |
connect_callback_ = new TrackedCompletionCallback( |
- instance()->module()->GetCallbackTracker(), pp_resource(), |
+ instance->module()->GetCallbackTracker(), pp_resource(), |
connect_callback); |
- broker_ = instance()->delegate()->ConnectToPpapiBroker(this); |
+ broker_ = instance->delegate()->ConnectToPpapiBroker(this); |
if (!broker_) { |
scoped_refptr<TrackedCompletionCallback> callback; |
callback.swap(connect_callback_); |