[PPAPI] Add browser tests for compositor API

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 101 matching lines @@
     if (!(*image_shm)->Map(desc.stride * desc.size.height)) {
       image_shm->reset();
       return PP_ERROR_NOMEMORY;
     }
     return PP_OK;
   }
 
   return PP_ERROR_BADARGUMENT;
 }
 
+// cc::Layer::SetNeedsCommit() is a protected method, we have to use a subclass
+// to make it assessable.
+class ContainerLayer : public cc::Layer {

[piman, 2014/06/18 00:55:24]

Please don't subclass cc::Layer outside of cc.

For this you can do layer_->layer_tree_host() (check for NULL)
->SetNeedsCommit().

[Peng, 2014/06/18 02:35:02]

Done.

+ public:
+  static scoped_refptr<cc::Layer> Create();
+  void ForceToCommit();
+
+ private:
+  ContainerLayer() {};
+  virtual ~ContainerLayer() {};
+
+  DISALLOW_COPY_AND_ASSIGN(ContainerLayer);
+};
+
+scoped_refptr<cc::Layer> ContainerLayer::Create() {
+  return make_scoped_refptr(new ContainerLayer());
+}
+
+void ContainerLayer::ForceToCommit() {
+  SetNeedsCommit();
+}
+
 }  // namespace
 
 PepperCompositorHost::LayerData::LayerData(
     const scoped_refptr<cc::Layer>& cc,
     const ppapi::CompositorLayerData& pp) : cc_layer(cc), pp_layer(pp) {}
 
 PepperCompositorHost::LayerData::~LayerData() {}
 
 PepperCompositorHost::PepperCompositorHost(
     RendererPpapiHost* host,
     PP_Instance instance,
     PP_Resource resource)
     : ResourceHost(host->GetPpapiHost(), instance, resource),
       bound_instance_(NULL),
       weak_factory_(this) {
-  layer_ = cc::Layer::Create();
-  // TODO(penghuang): SetMasksToBounds() can be expensive if the layer is
-  // transformed. Possibly better could be to explicitly clip the child layers
-  // (by modifying their bounds).
-  layer_->SetMasksToBounds(true);
-  layer_->SetIsDrawable(true);
 }
 
 PepperCompositorHost::~PepperCompositorHost() {
   // Unbind from the instance when destroyed if we're still bound.
   if (bound_instance_)
     bound_instance_->BindGraphics(bound_instance_->pp_instance(), 0);
 }
 
 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;
+  layer_ = NULL;
+  layers_.clear();
+  if (bound_instance_) {
+    layer_ = ContainerLayer::Create();
+    // TODO(penghuang): SetMasksToBounds() can be expensive if the layer is
+    // transformed. Possibly better could be to explicitly clip the child layers
+    // (by modifying their bounds).

[piman, 2014/06/18 00:55:24]

Note: what's expensive is not calling SetMasksToBounds, but having the
masks_to_bounds value be true. Is that why you moved this code? It doesn't seem
necessary.

[Peng, 2014/06/18 02:35:02]

No. Without this change, the below code will crash the blink. Seems reusing the
same layer_ in blink causes the problem.

instance->BindGraphics(compositor_);
.. do something
.. instance->BindGraphics(0);
.. instance->BindGraphics(compositor_); // bind the old compositor again, it
will crash blink.

+    layer_->SetMasksToBounds(true);
+    layer_->SetIsDrawable(true);
+  }
   return true;
+
 }
 
 void PepperCompositorHost::ViewInitiatedPaint() {
   if (!commit_layers_reply_context_.is_valid())
     return;
   host()->SendReply(commit_layers_reply_context_,
                     PpapiPluginMsg_Compositor_CommitLayersReply());
   commit_layers_reply_context_ = ppapi::host::ReplyMessageContext();
 }
 
@@ skipping 188 matching lines @@
     }
 
     UpdateLayer(cc_layer, old_layer, pp_layer, image_shms[i].Pass());
 
     if (old_layer)
       *old_layer = *pp_layer;
     else
       layers_.push_back(LayerData(cc_layer, *pp_layer));
   }
 
+  // We need force to commit on the parent layer, so the ViewInitiatedPaint()
+  // will be always called, even if all layers are not changed from previous
+  // CommitLayers() call.
+  (static_cast<ContainerLayer*>(layer_.get()))->ForceToCommit();
   return PP_OK_COMPLETIONPENDING;
 }
 
 }  // namespace content