Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: ppapi/proxy/ppb_instance_proxy.cc

Issue 11094060: Exclude host-side code from the NaCl IRT proxy build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/proxy/ppb_instance_proxy.cc
===================================================================
--- ppapi/proxy/ppb_instance_proxy.cc (revision 161132)
+++ ppapi/proxy/ppb_instance_proxy.cc (working copy)
@@ -94,10 +94,13 @@
// This must happen OUTSIDE of ExecuteScript since the SerializedVars use
// the dispatcher upon return of the function (converting the
// SerializedVarReturnValue/OutParam to a SerializedVar in the destructor).
+#if !defined(OS_NACL)
ScopedModuleReference death_grip(dispatcher());
+#endif
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(PPB_Instance_Proxy, msg)
+#if !defined(OS_NACL)
// Plugin -> Host messages.
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_GetWindowObject,
OnHostMsgGetWindowObject)
@@ -143,8 +146,6 @@
OnHostMsgCancelCompositionText)
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_UpdateSurroundingText,
OnHostMsgUpdateSurroundingText)
-
-#if !defined(OS_NACL)
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_ResolveRelativeToDocument,
OnHostMsgResolveRelativeToDocument)
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_DocumentCanRequest,
@@ -662,6 +663,7 @@
API_ID_PPB_INSTANCE, instance, text, caret, anchor));
}
+#if !defined(OS_NACL)
void PPB_Instance_Proxy::OnHostMsgGetWindowObject(
PP_Instance instance,
SerializedVarReturnValue result) {
@@ -1002,7 +1004,14 @@
anchor);
}
}
+void PPB_Instance_Proxy::MouseLockCompleteInHost(int32_t result,
+ PP_Instance instance) {
+ dispatcher()->Send(new PpapiMsg_PPBInstance_MouseLockComplete(
+ API_ID_PPB_INSTANCE, instance, result));
+}
+#endif // !defined(OS_NACL)
+
void PPB_Instance_Proxy::OnPluginMsgMouseLockComplete(PP_Instance instance,
int32_t result) {
// Save the mouse callback on the instance data.
@@ -1017,12 +1026,6 @@
TrackedCallback::ClearAndRun(&(data->mouse_lock_callback), result);
}
-void PPB_Instance_Proxy::MouseLockCompleteInHost(int32_t result,
- PP_Instance instance) {
- dispatcher()->Send(new PpapiMsg_PPBInstance_MouseLockComplete(
- API_ID_PPB_INSTANCE, instance, result));
-}
-
void PPB_Instance_Proxy::CancelAnyPendingRequestSurroundingText(
PP_Instance instance) {
InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->

Powered by Google App Engine
This is Rietveld 408576698