| OLD | NEW |
| 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/location.h" | 7 #include "base/location.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "base/task_runner.h" | 9 #include "base/task_runner.h" |
| 10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 // Currently proxied plugins don't use the PP_Module for anything useful. | 143 // Currently proxied plugins don't use the PP_Module for anything useful. |
| 144 return 0; | 144 return 0; |
| 145 } | 145 } |
| 146 | 146 |
| 147 std::string PluginGlobals::GetCmdLine() { | 147 std::string PluginGlobals::GetCmdLine() { |
| 148 return command_line_; | 148 return command_line_; |
| 149 } | 149 } |
| 150 | 150 |
| 151 void PluginGlobals::PreCacheFontForFlash(const void* logfontw) { | 151 void PluginGlobals::PreCacheFontForFlash(const void* logfontw) { |
| 152 ProxyAutoUnlock unlock; | 152 ProxyAutoUnlock unlock; |
| 153 plugin_proxy_delegate_->PreCacheFont(logfontw); | 153 plugin_proxy_delegate_->PreCacheFontForFlash(logfontw); |
| 154 } | 154 } |
| 155 | 155 |
| 156 void PluginGlobals::LogWithSource(PP_Instance instance, | 156 void PluginGlobals::LogWithSource(PP_Instance instance, |
| 157 PP_LogLevel level, | 157 PP_LogLevel level, |
| 158 const std::string& source, | 158 const std::string& source, |
| 159 const std::string& value) { | 159 const std::string& value) { |
| 160 const std::string& fixed_up_source = source.empty() ? plugin_name_ : source; | 160 const std::string& fixed_up_source = source.empty() ? plugin_name_ : source; |
| 161 PluginDispatcher::LogWithSource(instance, level, fixed_up_source, value); | 161 PluginDispatcher::LogWithSource(instance, level, fixed_up_source, value); |
| 162 } | 162 } |
| 163 | 163 |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 return true; | 259 return true; |
| 260 } | 260 } |
| 261 | 261 |
| 262 void PluginGlobals::OnReleaseKeepaliveThrottle() { | 262 void PluginGlobals::OnReleaseKeepaliveThrottle() { |
| 263 ppapi::ProxyLock::AssertAcquiredDebugOnly(); | 263 ppapi::ProxyLock::AssertAcquiredDebugOnly(); |
| 264 plugin_recently_active_ = false; | 264 plugin_recently_active_ = false; |
| 265 } | 265 } |
| 266 | 266 |
| 267 } // namespace proxy | 267 } // namespace proxy |
| 268 } // namespace ppapi | 268 } // namespace ppapi |
| OLD | NEW |