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

Side by Side Diff: ppapi/proxy/plugin_globals.cc

Issue 19492014: PPAPI: Purposely leak ProxyLock, fix shutdown race (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove static initializer Created 7 years, 3 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
« no previous file with comments | « ppapi/proxy/plugin_globals.h ('k') | ppapi/proxy/ppapi_proxy_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ppapi/proxy/plugin_globals.h" 5 #include "ppapi/proxy/plugin_globals.h"
6 6
7 #include "base/task_runner.h" 7 #include "base/task_runner.h"
8 #include "base/threading/thread.h" 8 #include "base/threading/thread.h"
9 #include "ipc/ipc_message.h" 9 #include "ipc/ipc_message.h"
10 #include "ipc/ipc_sender.h" 10 #include "ipc/ipc_sender.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 std::string PluginGlobals::GetCmdLine() { 122 std::string PluginGlobals::GetCmdLine() {
123 return command_line_; 123 return command_line_;
124 } 124 }
125 125
126 void PluginGlobals::PreCacheFontForFlash(const void* logfontw) { 126 void PluginGlobals::PreCacheFontForFlash(const void* logfontw) {
127 ProxyAutoUnlock unlock; 127 ProxyAutoUnlock unlock;
128 plugin_proxy_delegate_->PreCacheFont(logfontw); 128 plugin_proxy_delegate_->PreCacheFont(logfontw);
129 } 129 }
130 130
131 base::Lock* PluginGlobals::GetProxyLock() {
132 return &proxy_lock_;
133 }
134
135 void PluginGlobals::LogWithSource(PP_Instance instance, 131 void PluginGlobals::LogWithSource(PP_Instance instance,
136 PP_LogLevel level, 132 PP_LogLevel level,
137 const std::string& source, 133 const std::string& source,
138 const std::string& value) { 134 const std::string& value) {
139 const std::string& fixed_up_source = source.empty() ? plugin_name_ : source; 135 const std::string& fixed_up_source = source.empty() ? plugin_name_ : source;
140 PluginDispatcher::LogWithSource(instance, level, fixed_up_source, value); 136 PluginDispatcher::LogWithSource(instance, level, fixed_up_source, value);
141 } 137 }
142 138
143 void PluginGlobals::BroadcastLogWithSource(PP_Module /* module */, 139 void PluginGlobals::BroadcastLogWithSource(PP_Module /* module */,
144 PP_LogLevel level, 140 PP_LogLevel level,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 MessageLoopResource* PluginGlobals::loop_for_main_thread() { 189 MessageLoopResource* PluginGlobals::loop_for_main_thread() {
194 return loop_for_main_thread_.get(); 190 return loop_for_main_thread_.get();
195 } 191 }
196 192
197 bool PluginGlobals::IsPluginGlobals() const { 193 bool PluginGlobals::IsPluginGlobals() const {
198 return true; 194 return true;
199 } 195 }
200 196
201 } // namespace proxy 197 } // namespace proxy
202 } // namespace ppapi 198 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/proxy/plugin_globals.h ('k') | ppapi/proxy/ppapi_proxy_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698