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

trunk/src/content/renderer/pepper/pepper_compositor_host.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 "content/renderer/pepper/pepper_compositor_host.h"
 
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/solid_color_layer.h"
@@ skipping 140 matching lines @@
 
 bool PepperCompositorHost::BindToInstance(
     PepperPluginInstanceImpl* new_instance) {
   if (new_instance && new_instance->pp_instance() != pp_instance())
     return false;  // Can't bind other instance's contexts.
   if (bound_instance_ == new_instance)
     return true;  // Rebinding the same device, nothing to do.
   if (bound_instance_ && new_instance)
     return false;  // Can't change a bound device.
   bound_instance_ = new_instance;
-  if (!bound_instance_)
-    SendCommitLayersReplyIfNecessary();
-
   return true;
 }
 
 void PepperCompositorHost::ViewInitiatedPaint() {
-  SendCommitLayersReplyIfNecessary();
-}
-
-void PepperCompositorHost::ViewFlushedPaint() {}
-
-void PepperCompositorHost::ImageReleased(
-    int32_t id,
-    const scoped_ptr<base::SharedMemory>& shared_memory,
-    uint32_t sync_point,
-    bool is_lost) {
-  ResourceReleased(id, sync_point, is_lost);
-}
-
-void PepperCompositorHost::ResourceReleased(int32_t id,
-                                            uint32_t sync_point,
-                                            bool is_lost) {
-  host()->SendUnsolicitedReply(
-      pp_resource(),
-      PpapiPluginMsg_Compositor_ReleaseResource(id, sync_point, is_lost));
-}
-
-void PepperCompositorHost::SendCommitLayersReplyIfNecessary() {
   if (!commit_layers_reply_context_.is_valid())
     return;
   host()->SendReply(commit_layers_reply_context_,
                     PpapiPluginMsg_Compositor_CommitLayersReply());
   commit_layers_reply_context_ = ppapi::host::ReplyMessageContext();
 }
 
+void PepperCompositorHost::ViewFlushedPaint() {}
+
 void PepperCompositorHost::UpdateLayer(
     const scoped_refptr<cc::Layer>& layer,
     const ppapi::CompositorLayerData* old_layer,
     const ppapi::CompositorLayerData* new_layer,
     scoped_ptr<base::SharedMemory> image_shm) {
   // Always update properties on cc::Layer, because cc::Layer
   // will ignore any setting with unchanged value.
   layer->SetIsDrawable(true);
   layer->SetBlendMode(SkXfermode::kSrcOver_Mode);
   layer->SetOpacity(new_layer->common.opacity);
@@ skipping 86 matching lines @@
 
       // ImageData is always premultiplied alpha.
       image_layer->SetPremultipliedAlpha(true);
     }
     return;
   }
   // Should not be reached.
   NOTREACHED();
 }
 
+void PepperCompositorHost::ResourceReleased(int32_t id,
+                                            uint32_t sync_point,
+                                            bool is_lost) {
+  host()->SendUnsolicitedReply(
+      pp_resource(),
+      PpapiPluginMsg_Compositor_ReleaseResource(id, sync_point, is_lost));
+}
+
+void PepperCompositorHost::ImageReleased(
+    int32_t id,
+    const scoped_ptr<base::SharedMemory>& shared_memory,
+    uint32_t sync_point,
+    bool is_lost) {
+  ResourceReleased(id, sync_point, is_lost);
+}
+
 int32_t PepperCompositorHost::OnResourceMessageReceived(
     const IPC::Message& msg,
     HostMessageContext* context) {
   PPAPI_BEGIN_MESSAGE_MAP(PepperCompositorHost, msg)
   PPAPI_DISPATCH_HOST_RESOURCE_CALL(
       PpapiHostMsg_Compositor_CommitLayers, OnHostMsgCommitLayers)
   PPAPI_END_MESSAGE_MAP()
   return ppapi::host::ResourceHost::OnResourceMessageReceived(msg, context);
 }
 
 bool PepperCompositorHost::IsCompositorHost() {
   return true;
 }
 
 int32_t PepperCompositorHost::OnHostMsgCommitLayers(
     HostMessageContext* context,
     const std::vector<ppapi::CompositorLayerData>& layers,
     bool reset) {
+  // Do not support CommitLayers() on an unbounded compositor.
+  if (!bound_instance_)
+    return PP_ERROR_FAILED;
+
   if (commit_layers_reply_context_.is_valid())
     return PP_ERROR_INPROGRESS;
 
+  commit_layers_reply_context_ = context->MakeReplyMessageContext();
+
   scoped_ptr<scoped_ptr<base::SharedMemory>[]> image_shms;
   if (layers.size() > 0) {
     image_shms.reset(new scoped_ptr<base::SharedMemory>[layers.size()]);
     if (!image_shms)
       return PP_ERROR_NOMEMORY;
     // Verfiy the layers first, if an error happens, we will return the error to
     // plugin and keep current layers set by the previous CommitLayers()
     // unchanged.
     for (size_t i = 0; i < layers.size(); ++i) {
       const ppapi::CompositorLayerData* old_layer = NULL;
@@ skipping 33 matching lines @@
     else
       layers_.push_back(LayerData(cc_layer, *pp_layer));
   }
 
   // We need to force a commit for each CommitLayers() call, even if no layers
   // changed since the last call to CommitLayers(). This is so
   // WiewInitiatedPaint() will always be called.
   if (layer_->layer_tree_host())
     layer_->layer_tree_host()->SetNeedsCommit();
 
-  // If the host is not bound to the instance, return PP_OK immediately.
-  if (!bound_instance_)
-    return PP_OK;
-
-  commit_layers_reply_context_ = context->MakeReplyMessageContext();
   return PP_OK_COMPLETIONPENDING;
 }
 
 }  // namespace content