Index: ppapi/proxy/plugin_globals.cc |
diff --git a/ppapi/proxy/plugin_globals.cc b/ppapi/proxy/plugin_globals.cc |
index 82e16ffe328582f2a5bade188fad7057d1e4e4be..5c6ce0bcd2a8ca7e73743ebab82346abd858a49b 100644 |
--- a/ppapi/proxy/plugin_globals.cc |
+++ b/ppapi/proxy/plugin_globals.cc |
@@ -192,11 +192,8 @@ void PluginGlobals::MarkPluginIsActive() { |
} |
IPC::Sender* PluginGlobals::GetBrowserSender() { |
- if (!browser_sender_.get()) { |
- browser_sender_.reset( |
- new BrowserSender(plugin_proxy_delegate_->GetBrowserSender())); |
- } |
- |
+ // CAUTION: This funciton is called without the ProxyLock. See also |
teravest
2014/09/12 19:08:27
s/funciton/function
dmichael (off chromium)
2014/09/12 20:44:00
Done.
|
+ // InterfaceList::GetInterfaceForPPB. |
return browser_sender_.get(); |
} |
@@ -217,6 +214,12 @@ PP_Resource PluginGlobals::CreateBrowserFont( |
connection, instance, desc, prefs); |
} |
+void PluginGlobals::SetPluginProxyDelegate(PluginProxyDelegate* delegate) { |
+ plugin_proxy_delegate_ = delegate; |
+ browser_sender_.reset( |
+ new BrowserSender(plugin_proxy_delegate_->GetBrowserSender())); |
+} |
+ |
MessageLoopResource* PluginGlobals::loop_for_main_thread() { |
return loop_for_main_thread_.get(); |
} |