chromium/src
0
Fork 0
Code Activity

Remove PreCacheFontForFlash

Browse Source 
As part of Flash API removal, remove instances of
PreCacheFontForFlash. Generally, cache priming for GDI fonts
on Windows still seems to be needed for printing and PDF processes
but the flash reference can be deleted.

Bug: 1139287
Change-Id: Iebaac7c48b5fddbb81219b0fcc08b091597dee2f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2478990
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818851}
This commit is contained in:
Dominik Röttsches
2020-10-20 10:48:28 +00:00
committed by Commit Bot
parent 10d8c213ed
commit 10bdd19f59
14 changed files with 0 additions and 41 deletions

6
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());
}

1
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,

4
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,

1
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,

4
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();
}

1
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,

5
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,

1
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,

5
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;

4
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) {
}

1
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,

5
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;

2
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,

1
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,