diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 19:18:45 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 19:18:45 +0000 |
| commit | 6fc87e0160e55c5ea05ea7f9834a146598685458 (patch) | |
| tree | c5d2d6987e4ab9fe5710cc965a95b2e993141086 /ppapi/proxy/ppapi_proxy_test.h | |
| parent | b31580d250c3813b99fdd88a03e27d07fca9e236 (diff) | |
| download | chromium_src-6fc87e0160e55c5ea05ea7f9834a146598685458.zip chromium_src-6fc87e0160e55c5ea05ea7f9834a146598685458.tar.gz chromium_src-6fc87e0160e55c5ea05ea7f9834a146598685458.tar.bz2 | |
Hook up the PPB_Flash.PreloadFontWin function to our font loading infrastructure.
TEST=manual
Review URL: http://codereview.chromium.org/8979002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppapi_proxy_test.h')
| -rw-r--r-- | ppapi/proxy/ppapi_proxy_test.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/ppapi/proxy/ppapi_proxy_test.h b/ppapi/proxy/ppapi_proxy_test.h index cf71a5e..2a612ed 100644 --- a/ppapi/proxy/ppapi_proxy_test.h +++ b/ppapi/proxy/ppapi_proxy_test.h @@ -14,6 +14,7 @@ #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/plugin_globals.h" +#include "ppapi/proxy/plugin_proxy_delegate.h" #include "ppapi/proxy/plugin_resource_tracker.h" #include "ppapi/proxy/plugin_var_tracker.h" #include "testing/gtest/include/gtest/gtest.h" @@ -95,7 +96,8 @@ class PluginProxyTestHarness : public ProxyTestHarnessBase { bool is_client); virtual void TearDownHarness(); - class PluginDelegateMock : public PluginDispatcher::PluginDelegate { + class PluginDelegateMock : public PluginDispatcher::PluginDelegate, + public PluginProxyDelegate { public: PluginDelegateMock() : ipc_message_loop_(NULL), shutdown_event_() {} virtual ~PluginDelegateMock() {} @@ -107,17 +109,20 @@ class PluginProxyTestHarness : public ProxyTestHarnessBase { } // ProxyChannel::Delegate implementation. - virtual base::MessageLoopProxy* GetIPCMessageLoop(); - virtual base::WaitableEvent* GetShutdownEvent(); + virtual base::MessageLoopProxy* GetIPCMessageLoop() OVERRIDE; + virtual base::WaitableEvent* GetShutdownEvent() OVERRIDE; // PluginDispatcher::PluginDelegate implementation. - virtual std::set<PP_Instance>* GetGloballySeenInstanceIDSet(); - virtual ppapi::WebKitForwarding* GetWebKitForwarding(); + virtual std::set<PP_Instance>* GetGloballySeenInstanceIDSet() OVERRIDE; + virtual uint32 Register(PluginDispatcher* plugin_dispatcher) OVERRIDE; + virtual void Unregister(uint32 plugin_dispatcher_id) OVERRIDE; + + // PluginPepperDelegate implementation. + virtual ppapi::WebKitForwarding* GetWebKitForwarding() OVERRIDE; virtual void PostToWebKitThread(const tracked_objects::Location& from_here, - const base::Closure& task); - virtual bool SendToBrowser(IPC::Message* msg); - virtual uint32 Register(PluginDispatcher* plugin_dispatcher); - virtual void Unregister(uint32 plugin_dispatcher_id); + const base::Closure& task) OVERRIDE; + virtual bool SendToBrowser(IPC::Message* msg) OVERRIDE; + virtual void PreCacheFont(const void* logfontw) OVERRIDE; private: base::MessageLoopProxy* ipc_message_loop_; // Weak |