Revert 278728 "[PPAPI] Add browser tests for compositor API"

trunk/src/ppapi/proxy/compositor_layer_resource.cc

 // Copyright 2014 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/compositor_layer_resource.h"
 
 #include "base/logging.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "ppapi/proxy/compositor_resource.h"
@@ skipping 14 matching lines @@
 
 float clamp(float value) {
   return std::min(std::max(value, 0.0f), 1.0f);
 }
 
 void OnTextureReleased(
     const ScopedPPResource& layer,
     const ScopedPPResource& context,
     uint32_t texture,
     const scoped_refptr<TrackedCallback>& release_callback,
-    int32_t result,
     uint32_t sync_point,
     bool is_lost) {
   if (!TrackedCallback::IsPending(release_callback))
     return;
 
-  if (result != PP_OK) {
-    release_callback->Run(result);
-    return;
-  }
-
   do {
     if (!sync_point)
       break;
 
     EnterResourceNoLock<PPB_Graphics3D_API> enter(context.get(), true);
     if (enter.failed())
       break;
 
     PPB_Graphics3D_Shared* graphics =
         static_cast<PPB_Graphics3D_Shared*>(enter.object());
 
     GLES2Implementation* gl = graphics->gles2_impl();
     gl->WaitSyncPointCHROMIUM(sync_point);
   } while (false);
 
   release_callback->Run(is_lost ? PP_ERROR_FAILED : PP_OK);
 }
 
 void OnImageReleased(
     const ScopedPPResource& layer,
     const ScopedPPResource& image,
     const scoped_refptr<TrackedCallback>& release_callback,
-    int32_t result,
     uint32_t sync_point,
     bool is_lost) {
   if (!TrackedCallback::IsPending(release_callback))
     return;
-  release_callback->Run(result);
+  release_callback->Run(PP_OK);
 }
 
 }  // namespace
 
 CompositorLayerResource::CompositorLayerResource(
     Connection connection,
     PP_Instance instance,
     const CompositorResource* compositor)
     : PluginResource(connection, instance),
       compositor_(compositor),
@@ skipping 21 matching lines @@
   if (compositor_->IsInProgress())
     return PP_ERROR_INPROGRESS;
 
   if (!SetType(TYPE_COLOR))
     return PP_ERROR_BADARGUMENT;
   DCHECK(data_.color);
 
   if (!size)
     return PP_ERROR_BADARGUMENT;
 
+
   data_.color->red = clamp(red);
   data_.color->green = clamp(green);
   data_.color->blue = clamp(blue);
   data_.color->alpha = clamp(alpha);
   data_.common.size = *size;
 
   return PP_OK;
 }
 
 int32_t CompositorLayerResource::SetTexture(
@@ skipping 81 matching lines @@
   // Set the source size to image's size. It will be used to verify
   // the source_rect passed to SetSourceRect().
   source_size_ = PP_MakeFloatSize(desc.size.width, desc.size.height);
 
   data_.common.size = size ? *size : desc.size;
   data_.common.resource_id = compositor_->GenerateResourceId();
   data_.image->resource = enter.resource()->host_resource().host_resource();
   data_.image->source_rect.point = PP_MakeFloatPoint(0.0f, 0.0f);
   data_.image->source_rect.size = source_size_;
 
-  // If the PP_Resource of this layer is released by the plugin, the
-  // release_callback will be aborted immediately, but the texture or image
-  // in this layer may still being used by chromium compositor. So we have to
-  // use ScopedPPResource to keep this resource alive until the texture or image
-  // is released by the chromium compositor.
   release_callback_ = base::Bind(
       &OnImageReleased,
       ScopedPPResource(pp_resource()), // Keep layer alive.
       ScopedPPResource(image_data), // Keep image_data alive.
       release_callback);
 
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t CompositorLayerResource::SetClipRect(const PP_Rect* rect) {
@@ skipping 106 matching lines @@
   }
 
   // Should not be reached.
   DCHECK(false);
   return false;
 }
 
 int32_t CompositorLayerResource::CheckForSetTextureAndImage(
     LayerType type,
     const scoped_refptr<TrackedCallback>& release_callback) {
-  if (!compositor_)
+ if (!compositor_)
     return PP_ERROR_BADRESOURCE;
 
   if (compositor_->IsInProgress())
     return PP_ERROR_INPROGRESS;
 
   if (!SetType(type))
     return PP_ERROR_BADARGUMENT;
 
   // The layer's image has been set and it is not committed.
   if (!release_callback_.is_null())
     return PP_ERROR_INPROGRESS;
 
   // Do not allow using a block callback as a release callback.
   if (release_callback->is_blocking())
     return PP_ERROR_BADARGUMENT;
 
   return PP_OK;
 }
 
 }  // namespace proxy
 }  // namespace ppapi