Blink Compositor Animation: Erase old animation system.

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 <stddef.h>
 #include <limits>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/layer.h"
+#include "cc/layers/layer_settings.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/resources/texture_mailbox.h"
 #include "cc/trees/layer_tree_host.h"
 #include "content/child/child_shared_bitmap_manager.h"
 #include "content/child/child_thread_impl.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "content/renderer/pepper/gfx_conversion.h"
 #include "content/renderer/pepper/host_globals.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
@@ skipping 124 matching lines @@
 
 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(cc_blink::WebLayerImpl::LayerSettings());
+  layer_ = cc::Layer::Create(cc::LayerSettings());
   // 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_)
@@ skipping 66 matching lines @@
   layer->SetTransform(transform);
 
   // Consider a (0,0,0,0) rect as no clip rect.
   if (new_layer->common.clip_rect.point.x != 0 ||
       new_layer->common.clip_rect.point.y != 0 ||
       new_layer->common.clip_rect.size.width != 0 ||
       new_layer->common.clip_rect.size.height != 0) {
     scoped_refptr<cc::Layer> clip_parent = layer->parent();
     if (clip_parent.get() == layer_.get()) {
       // Create a clip parent layer, if it does not exist.
-      clip_parent = cc::Layer::Create(cc_blink::WebLayerImpl::LayerSettings());
+      clip_parent = cc::Layer::Create(cc::LayerSettings());
       clip_parent->SetMasksToBounds(true);
       clip_parent->SetIsDrawable(true);
       layer_->ReplaceChild(layer.get(), clip_parent);
       clip_parent->AddChild(layer);
     }
     auto position =
         gfx::PointF(PP_ToGfxPoint(new_layer->common.clip_rect.point));
     clip_parent->SetPosition(position);
     clip_parent->SetBounds(PP_ToGfxSize(new_layer->common.clip_rect.size));
     layer->SetPosition(gfx::PointF(-position.x(), -position.y()));
@@ skipping 123 matching lines @@
   for (size_t i = 0; i < layers.size(); ++i) {
     const ppapi::CompositorLayerData* pp_layer = &layers[i];
     LayerData* data = i >= layers_.size() ? NULL : &layers_[i];
     DCHECK(!data || data->cc_layer.get());
     scoped_refptr<cc::Layer> cc_layer = data ? data->cc_layer : NULL;
     ppapi::CompositorLayerData* old_layer = data ? &data->pp_layer : NULL;
 
     if (!cc_layer.get()) {
       if (pp_layer->color)
         cc_layer = cc::SolidColorLayer::Create(
-            cc_blink::WebLayerImpl::LayerSettings());
+            cc::LayerSettings());
       else if (pp_layer->texture || pp_layer->image)
         cc_layer = cc::TextureLayer::CreateForMailbox(
-            cc_blink::WebLayerImpl::LayerSettings(), NULL);
+            cc::LayerSettings(), NULL);
       layer_->AddChild(cc_layer);
     }
 
     UpdateLayer(cc_layer, old_layer, pp_layer, std::move(image_shms[i]));
 
     if (old_layer)
       *old_layer = *pp_layer;
     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