diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 00:02:04 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 00:02:04 +0000 |
| commit | c962f865bf8f137e0ff0a2013e1209eb5e95a163 (patch) | |
| tree | 4b843fc93e75b7437114b84145607dc254cb1652 /ppapi/proxy/ppb_instance_proxy.h | |
| parent | 550a65000b116270b30d508f6e59ba8a3eee4c24 (diff) | |
| download | chromium_src-c962f865bf8f137e0ff0a2013e1209eb5e95a163.zip chromium_src-c962f865bf8f137e0ff0a2013e1209eb5e95a163.tar.gz chromium_src-c962f865bf8f137e0ff0a2013e1209eb5e95a163.tar.bz2 | |
Eliminate use of PPB_URLUtil_Dev in NaCl build of Proxy.
BUG=116317
TEST=compiles and links without errors
Review URL: https://chromiumcodereview.appspot.com/9561001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_instance_proxy.h')
| -rw-r--r-- | ppapi/proxy/ppb_instance_proxy.h | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h index fdbeecb..aed90ab 100644 --- a/ppapi/proxy/ppb_instance_proxy.h +++ b/ppapi/proxy/ppb_instance_proxy.h @@ -87,6 +87,16 @@ class PPB_Instance_Proxy : public InterfaceProxy, virtual void ZoomLimitsChanged(PP_Instance instance, double minimum_factor, double maximium_factor) OVERRIDE; + virtual void PostMessage(PP_Instance instance, PP_Var message) OVERRIDE; + virtual PP_Bool SetCursor(PP_Instance instance, + PP_MouseCursor_Type type, + PP_Resource image, + const PP_Point* hot_spot) OVERRIDE; + virtual int32_t LockMouse(PP_Instance instance, + PP_CompletionCallback callback) OVERRIDE; + virtual void UnlockMouse(PP_Instance instance) OVERRIDE; + +#if !defined(OS_NACL) virtual PP_Var ResolveRelativeToDocument( PP_Instance instance, PP_Var relative, @@ -99,14 +109,7 @@ class PPB_Instance_Proxy : public InterfaceProxy, virtual PP_Var GetPluginInstanceURL( PP_Instance instance, PP_URLComponents_Dev* components) OVERRIDE; - virtual void PostMessage(PP_Instance instance, PP_Var message) OVERRIDE; - virtual PP_Bool SetCursor(PP_Instance instance, - PP_MouseCursor_Type type, - PP_Resource image, - const PP_Point* hot_spot) OVERRIDE; - virtual int32_t LockMouse(PP_Instance instance, - PP_CompletionCallback callback) OVERRIDE; - virtual void UnlockMouse(PP_Instance instance) OVERRIDE; +#endif // !defined(OS_NACL) static const ApiID kApiID = API_ID_PPB_INSTANCE; @@ -153,6 +156,11 @@ class PPB_Instance_Proxy : public InterfaceProxy, SerializedVarReceiveInput message); void OnHostMsgLockMouse(PP_Instance instance); void OnHostMsgUnlockMouse(PP_Instance instance); + void OnHostMsgSetCursor(PP_Instance instance, + int32_t type, + const ppapi::HostResource& custom_image, + const PP_Point& hot_spot); +#if !defined(OS_NACL) void OnHostMsgResolveRelativeToDocument(PP_Instance instance, SerializedVarReceiveInput relative, SerializedVarReturnValue result); @@ -166,10 +174,7 @@ class PPB_Instance_Proxy : public InterfaceProxy, SerializedVarReturnValue result); void OnHostMsgGetPluginInstanceURL(PP_Instance instance, SerializedVarReturnValue result); - void OnHostMsgSetCursor(PP_Instance instance, - int32_t type, - const ppapi::HostResource& custom_image, - const PP_Point& hot_spot); +#endif // !defined(OS_NACL) // Host -> Plugin message handlers. void OnPluginMsgMouseLockComplete(PP_Instance instance, int32_t result); |