Index: ppapi/proxy/ppb_graphics_2d_proxy.cc |
=================================================================== |
--- ppapi/proxy/ppb_graphics_2d_proxy.cc (revision 161132) |
+++ ppapi/proxy/ppb_graphics_2d_proxy.cc (working copy) |
@@ -198,6 +198,7 @@ |
bool PPB_Graphics2D_Proxy::OnMessageReceived(const IPC::Message& msg) { |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP(PPB_Graphics2D_Proxy, msg) |
+#if !defined(OS_NACL) |
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics2D_Create, |
OnHostMsgCreate) |
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics2D_PaintImageData, |
@@ -210,6 +211,7 @@ |
OnHostMsgFlush) |
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics2D_Dev_SetScale, |
OnHostMsgSetScale) |
+#endif // !defined(OS_NACL) |
IPC_MESSAGE_HANDLER(PpapiMsg_PPBGraphics2D_FlushACK, |
OnPluginMsgFlushACK) |
@@ -219,6 +221,7 @@ |
return handled; |
} |
+#if !defined(OS_NACL) |
void PPB_Graphics2D_Proxy::OnHostMsgCreate(PP_Instance instance, |
const PP_Size& size, |
PP_Bool is_always_opaque, |
@@ -290,6 +293,14 @@ |
enter.object()->SetScale(scale); |
} |
+void PPB_Graphics2D_Proxy::SendFlushACKToPlugin( |
brettw
2012/10/11 18:05:50
Can you revert the change to Graphics2D? Victor is
bbudge
2012/10/11 18:46:02
Done.
|
+ int32_t result, |
+ const HostResource& graphics_2d) { |
+ dispatcher()->Send(new PpapiMsg_PPBGraphics2D_FlushACK(kApiID, graphics_2d, |
+ result)); |
+} |
+#endif // !defined(OS_NACL) |
+ |
void PPB_Graphics2D_Proxy::OnPluginMsgFlushACK( |
const HostResource& host_resource, |
int32_t pp_error) { |
@@ -298,12 +309,5 @@ |
static_cast<Graphics2D*>(enter.object())->FlushACK(pp_error); |
} |
-void PPB_Graphics2D_Proxy::SendFlushACKToPlugin( |
- int32_t result, |
- const HostResource& graphics_2d) { |
- dispatcher()->Send(new PpapiMsg_PPBGraphics2D_FlushACK(kApiID, graphics_2d, |
- result)); |
-} |
- |
} // namespace proxy |
} // namespace ppapi |