diff options
author | mgiuca <mgiuca@chromium.org> | 2015-07-07 19:10:21 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-08 02:11:59 +0000 |
commit | 8ca5918882daa6ab1be0c50825af47fe9a896b23 (patch) | |
tree | a2bcc16ed4dc5003ec039cc85462f84bc613359e /ppapi | |
parent | 2452de2def483ca4011194e185bc8ed3a1b49bb3 (diff) | |
download | chromium_src-8ca5918882daa6ab1be0c50825af47fe9a896b23.zip chromium_src-8ca5918882daa6ab1be0c50825af47fe9a896b23.tar.gz chromium_src-8ca5918882daa6ab1be0c50825af47fe9a896b23.tar.bz2 |
Fixed all overloaded virtual methods on Windows.
This fixes the 'overloaded-virtual' Clang warning on Windows (currently
disabled; will be enabled in a follow-up CL).
- PpapiThread::PreCacheFont: Renamed to PreCacheFontForFlash to avoid
conflict with PreCacheFont method in base class ChildThreadImpl. (This
method is only called by another method called PreCacheFontForFlash so
the new name is appropriate.)
- PrintingContextSytemDialogWin::InitializeSettings: Renamed to
InitializeSettingsWithRanges to avoid conflict with InitializeSettings
in base class PrintingContextWin. (These two methods are called on
different code paths and the former is not meant to override the
latter, so they should have different names.)
- Removed PrintingContextWin::ShowPrintDialog. This method was totally
unused and its name was conflicting with a method in a subclass.
BUG=505301
Review URL: https://codereview.chromium.org/1216013005
Cr-Commit-Position: refs/heads/master@{#337735}
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/nacl_irt/ppapi_dispatcher.cc | 2 | ||||
-rw-r--r-- | ppapi/nacl_irt/ppapi_dispatcher.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/plugin_globals.cc | 2 | ||||
-rw-r--r-- | ppapi/proxy/plugin_proxy_delegate.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppapi_proxy_test.cc | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppapi_proxy_test.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/ppapi/nacl_irt/ppapi_dispatcher.cc b/ppapi/nacl_irt/ppapi_dispatcher.cc index c8374bb..42d900c 100644 --- a/ppapi/nacl_irt/ppapi_dispatcher.cc +++ b/ppapi/nacl_irt/ppapi_dispatcher.cc @@ -112,7 +112,7 @@ std::string PpapiDispatcher::GetUILanguage() { return std::string(); } -void PpapiDispatcher::PreCacheFont(const void* logfontw) { +void PpapiDispatcher::PreCacheFontForFlash(const void* logfontw) { NOTIMPLEMENTED(); } diff --git a/ppapi/nacl_irt/ppapi_dispatcher.h b/ppapi/nacl_irt/ppapi_dispatcher.h index 88e91be..0b193ab 100644 --- a/ppapi/nacl_irt/ppapi_dispatcher.h +++ b/ppapi/nacl_irt/ppapi_dispatcher.h @@ -68,7 +68,7 @@ class PpapiDispatcher : public proxy::PluginDispatcher::PluginDelegate, // PluginProxyDelegate implementation. IPC::Sender* GetBrowserSender() override; std::string GetUILanguage() override; - void PreCacheFont(const void* logfontw) 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 8d6e9dd..64ff47b 100644 --- a/ppapi/proxy/plugin_globals.cc +++ b/ppapi/proxy/plugin_globals.cc @@ -150,7 +150,7 @@ std::string PluginGlobals::GetCmdLine() { void PluginGlobals::PreCacheFontForFlash(const void* logfontw) { ProxyAutoUnlock unlock; - plugin_proxy_delegate_->PreCacheFont(logfontw); + plugin_proxy_delegate_->PreCacheFontForFlash(logfontw); } void PluginGlobals::LogWithSource(PP_Instance instance, diff --git a/ppapi/proxy/plugin_proxy_delegate.h b/ppapi/proxy/plugin_proxy_delegate.h index 438ac6c..ee92878 100644 --- a/ppapi/proxy/plugin_proxy_delegate.h +++ b/ppapi/proxy/plugin_proxy_delegate.h @@ -30,7 +30,7 @@ class PPAPI_PROXY_EXPORT PluginProxyDelegate { // 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 PreCacheFont(const void* logfontw) = 0; + 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 39a1a34..bd76918 100644 --- a/ppapi/proxy/ppapi_proxy_test.cc +++ b/ppapi/proxy/ppapi_proxy_test.cc @@ -287,7 +287,7 @@ std::string PluginProxyTestHarness::PluginDelegateMock::GetUILanguage() { return std::string("en-US"); } -void PluginProxyTestHarness::PluginDelegateMock::PreCacheFont( +void PluginProxyTestHarness::PluginDelegateMock::PreCacheFontForFlash( const void* logfontw) { } diff --git a/ppapi/proxy/ppapi_proxy_test.h b/ppapi/proxy/ppapi_proxy_test.h index 8932b22..897410d 100644 --- a/ppapi/proxy/ppapi_proxy_test.h +++ b/ppapi/proxy/ppapi_proxy_test.h @@ -152,7 +152,7 @@ class PluginProxyTestHarness : public ProxyTestHarnessBase { // PluginProxyDelegate implementation. IPC::Sender* GetBrowserSender() override; std::string GetUILanguage() override; - void PreCacheFont(const void* logfontw) override; + void PreCacheFontForFlash(const void* logfontw) override; void SetActiveURL(const std::string& url) override; PP_Resource CreateBrowserFont( Connection connection, |