Fix Graphics2D in NaCl.

ppapi/proxy/ppb_instance_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/ppb_instance_proxy.h"
 
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_time.h"
@@ skipping 185 matching lines @@
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 PP_Bool PPB_Instance_Proxy::BindGraphics(PP_Instance instance,
                                          PP_Resource device) {
   // If device is 0, pass a null HostResource. This signals the host to unbind
   // all devices.
   HostResource host_resource;
   PP_Resource pp_resource = 0;
-  PP_Bool result = PP_FALSE;
   if (device) {
     Resource* resource =
         PpapiGlobals::Get()->GetResourceTracker()->GetResource(device);
     if (!resource || resource->pp_instance() != instance)
       return PP_FALSE;
     host_resource = resource->host_resource();
     pp_resource = resource->pp_resource();
   } else {
     // Passing 0 means unbinding all devices.
     dispatcher()->Send(new PpapiHostMsg_PPBInstance_BindGraphics(
-        API_ID_PPB_INSTANCE, instance, 0, &result));
-    return result;
+        API_ID_PPB_INSTANCE, instance, 0));
+    return PP_TRUE;
   }
 
   // We need to pass different resource to Graphics 2D and 3D right now.  Once
   // 3D is migrated to the new design, we should be able to unify this.
   EnterResourceNoLock<PPB_Graphics2D_API> enter_2d(device, false);
   EnterResourceNoLock<PPB_Graphics3D_API> enter_3d(device, false);
   if (enter_2d.succeeded()) {
     dispatcher()->Send(new PpapiHostMsg_PPBInstance_BindGraphics(
-        API_ID_PPB_INSTANCE, instance, pp_resource,
-        &result));
+        API_ID_PPB_INSTANCE, instance, pp_resource));
+    return PP_TRUE;
   } else if (enter_3d.succeeded()) {
     dispatcher()->Send(new PpapiHostMsg_PPBInstance_BindGraphics(
-        API_ID_PPB_INSTANCE, instance, host_resource.host_resource(),
-        &result));
+        API_ID_PPB_INSTANCE, instance, host_resource.host_resource()));
+    return PP_TRUE;
   }
-  return result;
+  return PP_FALSE;
 }
 
 PP_Bool PPB_Instance_Proxy::IsFullFrame(PP_Instance instance) {
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_IsFullFrame(
       API_ID_PPB_INSTANCE, instance, &result));
   return result;
 }
 
 const ViewData* PPB_Instance_Proxy::GetViewData(PP_Instance instance) {
@@ skipping 558 matching lines @@
     PP_Instance instance,
     SerializedVarReturnValue result) {
   EnterInstanceNoLock enter(instance);
   if (enter.succeeded()) {
     result.Return(dispatcher(),
                   enter.functions()->GetOwnerElementObject(instance));
   }
 }
 
 void PPB_Instance_Proxy::OnHostMsgBindGraphics(PP_Instance instance,
-                                               PP_Resource device,
-                                               PP_Bool* result) {
+                                               PP_Resource device) {
+  // Note that we ignroe the return value here. Otherwise, this would need to
+  // be a slow sync call, and the plugin side of the proxy will have already
+  // validated the resources, so we shouldn't see errors here that weren't
+  // already caught.
   EnterInstanceNoLock enter(instance);
-  if (enter.succeeded()) {
-    *result = enter.functions()->BindGraphics(instance, device);
-  }
+  if (enter.succeeded())
+    enter.functions()->BindGraphics(instance, device);
 }
 
 void PPB_Instance_Proxy::OnHostMsgGetAudioHardwareOutputSampleRate(
     PP_Instance instance, uint32_t* result) {
   EnterInstanceNoLock enter(instance);
   if (enter.succeeded())
     *result = enter.functions()->GetAudioHardwareOutputSampleRate(instance);
 }
 
 void PPB_Instance_Proxy::OnHostMsgGetAudioHardwareOutputBufferSize(
@@ skipping 364 matching lines @@
     PP_Instance instance) {
   InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->
       GetInstanceData(instance);
   if (!data)
     return;  // Instance was probably deleted.
   data->should_do_request_surrounding_text = false;
 }
 
 }  // namespace proxy
 }  // namespace ppapi