diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 19a442310c4e1..f4f6a01659cc9 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -192,12 +192,6 @@ std::string PpapiThread::GetUILanguage() { return command_line->GetSwitchValueASCII(switches::kLang); } -void PpapiThread::PreCacheFontForFlash(const void* logfontw) { -#if defined(OS_WIN) - ChildThreadImpl::PreCacheFont(*static_cast<const LOGFONTW*>(logfontw)); -#endif -} - void PpapiThread::SetActiveURL(const std::string& url) { GetContentClient()->SetActiveURL(GURL(url), std::string()); } diff --git a/content/ppapi_plugin/ppapi_thread.h b/content/ppapi_plugin/ppapi_thread.h index 6e34ee67f1bb6..ae059e216d81f 100644 --- a/content/ppapi_plugin/ppapi_thread.h +++ b/content/ppapi_plugin/ppapi_thread.h @@ -82,7 +82,6 @@ class PpapiThread : public ChildThreadImpl, // long as the main PpapiThread outlives it. IPC::Sender* GetBrowserSender() override; std::string GetUILanguage() override; - void PreCacheFontForFlash(const void* logfontw) override; void SetActiveURL(const std::string& url) override; PP_Resource CreateBrowserFont(ppapi::proxy::Connection connection, PP_Instance instance, diff --git a/content/renderer/pepper/host_globals.cc b/content/renderer/pepper/host_globals.cc index 29e776477bcd6..e57c14054e6ef 100644 --- a/content/renderer/pepper/host_globals.cc +++ b/content/renderer/pepper/host_globals.cc @@ -133,10 +133,6 @@ PP_Module HostGlobals::GetModuleForInstance(PP_Instance instance) { return inst->module()->pp_module(); } -void HostGlobals::PreCacheFontForFlash(const void* logfontw) { - // Not implemented in-process. -} - void HostGlobals::LogWithSource(PP_Instance instance, PP_LogLevel level, const std::string& source, diff --git a/content/renderer/pepper/host_globals.h b/content/renderer/pepper/host_globals.h index 057070ca650eb..996299600da9c 100644 --- a/content/renderer/pepper/host_globals.h +++ b/content/renderer/pepper/host_globals.h @@ -40,7 +40,6 @@ class HostGlobals : public ppapi::PpapiGlobals { ppapi::thunk::ResourceCreationAPI* GetResourceCreationAPI( PP_Instance instance) override; PP_Module GetModuleForInstance(PP_Instance instance) override; - void PreCacheFontForFlash(const void* logfontw) override; void LogWithSource(PP_Instance instance, PP_LogLevel level, const std::string& source, diff --git a/ppapi/nacl_irt/ppapi_dispatcher.cc b/ppapi/nacl_irt/ppapi_dispatcher.cc index 8642c75eb43b1..d10ae080c628f 100644 --- a/ppapi/nacl_irt/ppapi_dispatcher.cc +++ b/ppapi/nacl_irt/ppapi_dispatcher.cc @@ -120,10 +120,6 @@ std::string PpapiDispatcher::GetUILanguage() { return std::string(); } -void PpapiDispatcher::PreCacheFontForFlash(const void* logfontw) { - NOTIMPLEMENTED(); -} - void PpapiDispatcher::SetActiveURL(const std::string& url) { NOTIMPLEMENTED(); } diff --git a/ppapi/nacl_irt/ppapi_dispatcher.h b/ppapi/nacl_irt/ppapi_dispatcher.h index e40ad9b848be9..bbdd761f9e96f 100644 --- a/ppapi/nacl_irt/ppapi_dispatcher.h +++ b/ppapi/nacl_irt/ppapi_dispatcher.h @@ -74,7 +74,6 @@ class PpapiDispatcher : public proxy::PluginDispatcher::PluginDelegate, // PluginProxyDelegate implementation. IPC::Sender* GetBrowserSender() override; std::string GetUILanguage() override; - void PreCacheFontForFlash(const void* logfontw) override; void SetActiveURL(const std::string& url) override; PP_Resource CreateBrowserFont(proxy::Connection connection, PP_Instance instance, diff --git a/ppapi/proxy/plugin_globals.cc b/ppapi/proxy/plugin_globals.cc index a84cfef17d9f2..efe957b2a54e2 100644 --- a/ppapi/proxy/plugin_globals.cc +++ b/ppapi/proxy/plugin_globals.cc @@ -138,11 +138,6 @@ PP_Module PluginGlobals::GetModuleForInstance(PP_Instance instance) { return 0; } -void PluginGlobals::PreCacheFontForFlash(const void* logfontw) { - ProxyAutoUnlock unlock; - plugin_proxy_delegate_->PreCacheFontForFlash(logfontw); -} - void PluginGlobals::LogWithSource(PP_Instance instance, PP_LogLevel level, const std::string& source, diff --git a/ppapi/proxy/plugin_globals.h b/ppapi/proxy/plugin_globals.h index 9a3e87be888b9..ac393141e694d 100644 --- a/ppapi/proxy/plugin_globals.h +++ b/ppapi/proxy/plugin_globals.h @@ -70,7 +70,6 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals { thunk::ResourceCreationAPI* GetResourceCreationAPI( PP_Instance instance) override; PP_Module GetModuleForInstance(PP_Instance instance) override; - void PreCacheFontForFlash(const void* logfontw) override; void LogWithSource(PP_Instance instance, PP_LogLevel level, const std::string& source, diff --git a/ppapi/proxy/plugin_proxy_delegate.h b/ppapi/proxy/plugin_proxy_delegate.h index ee92878b9f30f..3bdf317b70bf7 100644 --- a/ppapi/proxy/plugin_proxy_delegate.h +++ b/ppapi/proxy/plugin_proxy_delegate.h @@ -27,11 +27,6 @@ class PPAPI_PROXY_EXPORT PluginProxyDelegate { // Returns the language code of the current UI language. virtual std::string GetUILanguage() = 0; - // Performs Windows-specific font caching in the browser for the given - // LOGFONTW. Does nothing on non-Windows platforms. - // Note: This method must be thread-safe. - virtual void PreCacheFontForFlash(const void* logfontw) = 0; - // Sets the active url which is reported by breakpad. virtual void SetActiveURL(const std::string& url) = 0; diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc index 0cf09cc8bdcd3..9ca9b4cadf139 100644 --- a/ppapi/proxy/ppapi_proxy_test.cc +++ b/ppapi/proxy/ppapi_proxy_test.cc @@ -290,10 +290,6 @@ std::string PluginProxyTestHarness::PluginDelegateMock::GetUILanguage() { return std::string("en-US"); } -void PluginProxyTestHarness::PluginDelegateMock::PreCacheFontForFlash( - const void* logfontw) { -} - void PluginProxyTestHarness::PluginDelegateMock::SetActiveURL( const std::string& url) { } diff --git a/ppapi/proxy/ppapi_proxy_test.h b/ppapi/proxy/ppapi_proxy_test.h index 140735b5c81ea..a2a0001eaec88 100644 --- a/ppapi/proxy/ppapi_proxy_test.h +++ b/ppapi/proxy/ppapi_proxy_test.h @@ -161,7 +161,6 @@ class PluginProxyTestHarness : public ProxyTestHarnessBase { // PluginProxyDelegate implementation. IPC::Sender* GetBrowserSender() override; std::string GetUILanguage() override; - void PreCacheFontForFlash(const void* logfontw) override; void SetActiveURL(const std::string& url) override; PP_Resource CreateBrowserFont( Connection connection, diff --git a/ppapi/shared_impl/ppapi_globals.h b/ppapi/shared_impl/ppapi_globals.h index 59f89047ada97..90686e91e6854 100644 --- a/ppapi/shared_impl/ppapi_globals.h +++ b/ppapi/shared_impl/ppapi_globals.h @@ -117,11 +117,6 @@ class PPAPI_SHARED_EXPORT PpapiGlobals { // in-process plugins. virtual base::TaskRunner* GetFileTaskRunner() = 0; - // Preloads the font on Windows, does nothing on other platforms. - // TODO(brettw) remove this by passing the instance into the API so we don't - // have to have it on the globals. - virtual void PreCacheFontForFlash(const void* logfontw) = 0; - virtual bool IsHostGlobals() const; virtual bool IsPluginGlobals() const; diff --git a/ppapi/shared_impl/test_globals.cc b/ppapi/shared_impl/test_globals.cc index b7c57b60a54fd..ee83136ec8347 100644 --- a/ppapi/shared_impl/test_globals.cc +++ b/ppapi/shared_impl/test_globals.cc @@ -40,8 +40,6 @@ thunk::ResourceCreationAPI* TestGlobals::GetResourceCreationAPI( PP_Module TestGlobals::GetModuleForInstance(PP_Instance instance) { return 0; } -void TestGlobals::PreCacheFontForFlash(const void* /* logfontw */) {} - void TestGlobals::LogWithSource(PP_Instance instance, PP_LogLevel level, const std::string& source, diff --git a/ppapi/shared_impl/test_globals.h b/ppapi/shared_impl/test_globals.h index c7b69946b2c06..776c3a441e41a 100644 --- a/ppapi/shared_impl/test_globals.h +++ b/ppapi/shared_impl/test_globals.h @@ -69,7 +69,6 @@ class TestGlobals : public PpapiGlobals { thunk::ResourceCreationAPI* GetResourceCreationAPI( PP_Instance instance) override; PP_Module GetModuleForInstance(PP_Instance instance) override; - void PreCacheFontForFlash(const void* logfontw) override; void LogWithSource(PP_Instance instance, PP_LogLevel level, const std::string& source,