ui/compositor: use cc/ directly instead of webkit

ui/compositor/layer.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 "ui/compositor/layer.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSupport.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayer.h"
+#include "cc/content_layer.h"
+#include "cc/solid_color_layer.h"
+#include "cc/texture_layer.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebSolidColorLayer.h"
 #include "ui/base/animation/animation.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/size_conversions.h"
@@ skipping 29 matching lines @@
       layer_brightness_(0.0f),
       layer_grayscale_(0.0f),
       layer_inverted_(false),
       layer_mask_(NULL),
       layer_mask_back_link_(NULL),
       zoom_x_offset_(0),
       zoom_y_offset_(0),
       zoom_(1),
       zoom_inset_(0),
       delegate_(NULL),
-      web_layer_(NULL),
+      cc_layer_(NULL),
       scale_content_(true),
       device_scale_factor_(1.0f) {
   CreateWebLayer();
 }
 
 Layer::Layer(LayerType type)
     : type_(type),
       compositor_(NULL),
       parent_(NULL),
       visible_(true),
@@ skipping 28 matching lines @@
   if (compositor_)
     compositor_->SetRootLayer(NULL);
   if (parent_)
     parent_->Remove(this);
   if (layer_mask_)
     SetMaskLayer(NULL);
   if (layer_mask_back_link_)
     layer_mask_back_link_->SetMaskLayer(NULL);
   for (size_t i = 0; i < children_.size(); ++i)
     children_[i]->parent_ = NULL;
-  web_layer_->removeFromParent();
+  cc_layer_->removeFromParent();
 }
 
 Compositor* Layer::GetCompositor() {
   return GetRoot(this)->compositor_;
 }
 
 void Layer::SetCompositor(Compositor* compositor) {
   // This function must only be called to set the compositor on the root layer,
   // or to reset it.
   DCHECK(!compositor || !compositor_);
   DCHECK(!compositor || compositor->root_layer() == this);
   DCHECK(!parent_);
   compositor_ = compositor;
   if (compositor)
     OnDeviceScaleFactorChanged(compositor->device_scale_factor());
 }
 
 void Layer::Add(Layer* child) {
   DCHECK(!child->compositor_);
   if (child->parent_)
     child->parent_->Remove(child);
   child->parent_ = this;
   children_.push_back(child);
-  web_layer_->addChild(child->web_layer_);
+  cc_layer_->addChild(child->cc_layer_);
   child->OnDeviceScaleFactorChanged(device_scale_factor_);
 }
 
 void Layer::Remove(Layer* child) {
   std::vector<Layer*>::iterator i =
       std::find(children_.begin(), children_.end(), child);
   DCHECK(i != children_.end());
   children_.erase(i);
   child->parent_ = NULL;
-  child->web_layer_->removeFromParent();
+  child->cc_layer_->removeFromParent();
 }
 
 void Layer::StackAtTop(Layer* child) {
   if (children_.size() <= 1 || child == children_.back())
     return;  // Already in front.
   StackAbove(child, children_.back());
 }
 
 void Layer::StackAbove(Layer* child, Layer* other) {
   StackRelativeTo(child, other, true);
@@ skipping 47 matching lines @@
 
 gfx::Rect Layer::GetTargetBounds() const {
   if (animator_.get() && animator_->IsAnimatingProperty(
       LayerAnimationElement::BOUNDS)) {
     return animator_->GetTargetBounds();
   }
   return bounds_;
 }
 
 void Layer::SetMasksToBounds(bool masks_to_bounds) {
-  web_layer_->setMasksToBounds(masks_to_bounds);
+  cc_layer_->setMasksToBounds(masks_to_bounds);
 }
 
 bool Layer::GetMasksToBounds() const {
-  return web_layer_->masksToBounds();
+  return cc_layer_->masksToBounds();
 }
 
 void Layer::SetOpacity(float opacity) {
   GetAnimator()->SetOpacity(opacity);
 }
 
 float Layer::GetCombinedOpacity() const {
   float opacity = opacity_;
   Layer* current = this->parent_;
   while (current) {
@@ skipping 50 matching lines @@
           layer_mask->children().empty() &&
           !layer_mask->layer_mask_back_link_));
   DCHECK(!layer_mask_back_link_);
   if (layer_mask_ == layer_mask)
     return;
   // We need to de-reference the currently linked object so that no problem
   // arises if the mask layer gets deleted before this object.
   if (layer_mask_)
     layer_mask_->layer_mask_back_link_ = NULL;
   layer_mask_ = layer_mask;
-  web_layer_->setMaskLayer(
-      layer_mask ? layer_mask->web_layer() : NULL);
+  cc_layer_->setMaskLayer(
+      layer_mask ? layer_mask->cc_layer() : NULL);
   // We need to reference the linked object so that it can properly break the
   // link to us when it gets deleted.
   if (layer_mask) {
     layer_mask->layer_mask_back_link_ = this;
     layer_mask->OnDeviceScaleFactorChanged(device_scale_factor_);
   }
 }
 
 void Layer::SetBackgroundZoom(float x_offset,
                               float y_offset,
@@ skipping 20 matching lines @@
   if (layer_inverted_)
     filters.append(WebKit::WebFilterOperation::createInvertFilter(1.0));
   // Brightness goes last, because the resulting colors neeed clamping, which
   // cause further color matrix filters to be applied separately. In this order,
   // they all can be combined in a single pass.
   if (layer_brightness_) {
     filters.append(WebKit::WebFilterOperation::createBrightnessFilter(
         layer_brightness_));
   }
 
-  web_layer_->setFilters(filters);
+  cc_layer_->setFilters(filters);
 }
 
 void Layer::SetLayerBackgroundFilters() {
   WebKit::WebFilterOperations filters;
   if (zoom_ != 1) {
     filters.append(WebKit::WebFilterOperation::createZoomFilter(
         WebKit::WebRect(zoom_x_offset_, zoom_y_offset_,
                         (GetTargetBounds().width() / zoom_),
                         (GetTargetBounds().height() / zoom_)),
         zoom_inset_));
   }
 
   if (background_blur_radius_) {
     filters.append(WebKit::WebFilterOperation::createBlurFilter(
         background_blur_radius_));
   }
 
-  web_layer_->setBackgroundFilters(filters);
+  cc_layer_->setBackgroundFilters(filters);
 }
 
 float Layer::GetTargetOpacity() const {
   if (animator_.get() && animator_->IsAnimatingProperty(
       LayerAnimationElement::OPACITY))
     return animator_->GetTargetOpacity();
   return opacity_;
 }
 
 void Layer::SetVisible(bool visible) {
@@ skipping 33 matching lines @@
   if (target != root_layer)
     target->ConvertPointFromAncestor(root_layer, point);
 }
 
 void Layer::SetFillsBoundsOpaquely(bool fills_bounds_opaquely) {
   if (fills_bounds_opaquely_ == fills_bounds_opaquely)
     return;
 
   fills_bounds_opaquely_ = fills_bounds_opaquely;
 
-  web_layer_->setOpaque(fills_bounds_opaquely);
+  cc_layer_->setContentsOpaque(fills_bounds_opaquely);
 }
 
 void Layer::SetExternalTexture(Texture* texture) {
   DCHECK_EQ(type_, LAYER_TEXTURED);
   layer_updated_externally_ = !!texture;
   texture_ = texture;
-  if (web_layer_is_accelerated_ != layer_updated_externally_) {
+  if (cc_layer_is_accelerated_ != layer_updated_externally_) {
     // Switch to a different type of layer.
-    web_layer_->removeAllChildren();
-    scoped_ptr<WebKit::WebContentLayer> old_content_layer(
+    cc_layer_->removeAllChildren();
+    scoped_refptr<cc::ContentLayer> old_content_layer(
         content_layer_.release());
-    scoped_ptr<WebKit::WebSolidColorLayer> old_solid_layer(
+    scoped_refptr<cc::SolidColorLayer> old_solid_layer(
         solid_color_layer_.release());
-    scoped_ptr<WebKit::WebExternalTextureLayer> old_texture_layer(
+    scoped_refptr<cc::TextureLayer> old_texture_layer(
         texture_layer_.release());
-    WebKit::WebLayer* new_layer = NULL;
-    WebKit::WebCompositorSupport* compositor_support =
-        WebKit::Platform::current()->compositorSupport();
+    cc::Layer* new_layer = NULL;
     if (layer_updated_externally_) {
-      texture_layer_.reset(
-          compositor_support->createExternalTextureLayer(this));
+      texture_layer_ = cc::TextureLayer::create(this);
       texture_layer_->setFlipped(texture_->flipped());
-      new_layer = texture_layer_->layer();
+      new_layer = texture_layer_.get();
     } else {
       old_texture_layer->willModifyTexture();
-      content_layer_.reset(compositor_support->createContentLayer(this));
-      new_layer = content_layer_->layer();
+      content_layer_ = cc::ContentLayer::create(this);
+      new_layer = content_layer_.get();
     }
     if (parent_) {
-      DCHECK(parent_->web_layer_);
-      parent_->web_layer_->replaceChild(web_layer_, new_layer);
+      DCHECK(parent_->cc_layer_);
+      parent_->cc_layer_->replaceChild(cc_layer_, new_layer);
     }
-    web_layer_= new_layer;
-    web_layer_is_accelerated_ = layer_updated_externally_;
+    cc_layer_= new_layer;
+    cc_layer_is_accelerated_ = layer_updated_externally_;
     for (size_t i = 0; i < children_.size(); ++i) {
-      DCHECK(children_[i]->web_layer_);
-      web_layer_->addChild(children_[i]->web_layer_);
+      DCHECK(children_[i]->cc_layer_);
+      cc_layer_->addChild(children_[i]->cc_layer_);
     }
-    web_layer_->setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
-    web_layer_->setOpaque(fills_bounds_opaquely_);
-    web_layer_->setOpacity(visible_ ? opacity_ : 0.f);
-    web_layer_->setForceRenderSurface(force_render_surface_);
+    cc_layer_->setAnchorPoint(gfx::PointF());
+    cc_layer_->setContentsOpaque(fills_bounds_opaquely_);
+    cc_layer_->setOpacity(visible_ ? opacity_ : 0.f);
+    cc_layer_->setForceRenderSurface(force_render_surface_);
+    cc_layer_->setIsDrawable(true);
     RecomputeTransform();
   }
   RecomputeDrawsContentAndUVRect();
 }
 
 void Layer::SetColor(SkColor color) {
   GetAnimator()->SetColor(color);
 }
 
 bool Layer::SchedulePaint(const gfx::Rect& invalid_rect) {
@@ skipping 20 matching lines @@
     for (SkRegion::Iterator iter(damaged_region_);
          !iter.done(); iter.next()) {
       const SkIRect& sk_damaged = iter.rect();
       gfx::Rect damaged(
           sk_damaged.x(),
           sk_damaged.y(),
           sk_damaged.width(),
           sk_damaged.height());
 
       gfx::Rect damaged_in_pixel = ConvertRectToPixel(this, damaged);
-      WebKit::WebFloatRect web_rect(
-          damaged_in_pixel.x(),
-          damaged_in_pixel.y(),
-          damaged_in_pixel.width(),
-          damaged_in_pixel.height());
-      web_layer_->invalidateRect(web_rect);
+      cc_layer_->setNeedsDisplayRect(damaged_in_pixel);
     }
     damaged_region_.setEmpty();
   }
   for (size_t i = 0; i < children_.size(); ++i)
     children_[i]->SendDamagedRects();
 }
 
 void Layer::SuppressPaint() {
   if (!delegate_)
     return;
@@ skipping 10 matching lines @@
   RecomputeDrawsContentAndUVRect();
   SchedulePaint(gfx::Rect(bounds_.size()));
   if (delegate_)
     delegate_->OnDeviceScaleFactorChanged(device_scale_factor);
   for (size_t i = 0; i < children_.size(); ++i)
     children_[i]->OnDeviceScaleFactorChanged(device_scale_factor);
   if (layer_mask_)
     layer_mask_->OnDeviceScaleFactorChanged(device_scale_factor);
 }
 
-void Layer::paintContents(WebKit::WebCanvas* web_canvas,
-                          const WebKit::WebRect& clip,
-#if WEBCONTENTLAYERCLIENT_HAS_CANPAINTLCDTEXT
-                          bool can_paint_lcd_text,
-#endif  // WEBCONTENTLAYERCLIENT_HAS_CANPAINTLCDTEXT
-                          WebKit::WebFloatRect& opaque) {
+void Layer::paintContents(SkCanvas* sk_canvas,
+                          const gfx::Rect& clip,
+                          gfx::RectF& opaque) {
   TRACE_EVENT0("ui", "Layer::paintContents");
   scoped_ptr<gfx::Canvas> canvas(gfx::Canvas::CreateCanvasWithoutScaling(
-      web_canvas, ui::GetScaleFactorFromScale(device_scale_factor_)));
+      sk_canvas, ui::GetScaleFactorFromScale(device_scale_factor_)));
 
   bool scale_content = scale_content_;
   if (scale_content) {
     canvas->Save();
     canvas->sk_canvas()->scale(SkFloatToScalar(device_scale_factor_),
                                SkFloatToScalar(device_scale_factor_));
   }
 
   if (delegate_)
     delegate_->OnPaintLayer(canvas.get());
   if (scale_content)
     canvas->Restore();
 }
 
-unsigned Layer::prepareTexture(WebKit::WebTextureUpdater& /* updater */) {
+unsigned Layer::prepareTexture(cc::ResourceUpdateQueue&) {
   DCHECK(layer_updated_externally_);
   return texture_->PrepareTexture();
 }
 
 WebKit::WebGraphicsContext3D* Layer::context() {
   DCHECK(layer_updated_externally_);
   return texture_->HostContext3D();
 }
 
 void Layer::SetForceRenderSurface(bool force) {
   if (force_render_surface_ == force)
     return;
 
   force_render_surface_ = force;
-  web_layer_->setForceRenderSurface(force_render_surface_);
+  cc_layer_->setForceRenderSurface(force_render_surface_);
 }
 
 void Layer::StackRelativeTo(Layer* child, Layer* other, bool above) {
   DCHECK_NE(child, other);
   DCHECK_EQ(this, child->parent());
   DCHECK_EQ(this, other->parent());
 
   const size_t child_i =
       std::find(children_.begin(), children_.end(), child) - children_.begin();
   const size_t other_i =
       std::find(children_.begin(), children_.end(), other) - children_.begin();
   if ((above && child_i == other_i + 1) || (!above && child_i + 1 == other_i))
     return;
 
   const size_t dest_i =
       above ?
       (child_i < other_i ? other_i : other_i + 1) :
       (child_i < other_i ? other_i - 1 : other_i);
   children_.erase(children_.begin() + child_i);
   children_.insert(children_.begin() + dest_i, child);
 
-  child->web_layer_->removeFromParent();
-  web_layer_->insertChild(child->web_layer_, dest_i);
+  child->cc_layer_->removeFromParent();
+  cc_layer_->insertChild(child->cc_layer_, dest_i);
 }
 
 bool Layer::ConvertPointForAncestor(const Layer* ancestor,
                                     gfx::Point* point) const {
   gfx::Transform transform;
   bool result = GetTransformRelativeTo(ancestor, &transform);
   gfx::Point3F p(*point);
   transform.TransformPoint(p);
   *point = gfx::ToFlooredPoint(p.AsPointF());
   return result;
@@ skipping 51 matching lines @@
   transform_ = transform;
 
   RecomputeTransform();
 }
 
 void Layer::SetOpacityImmediately(float opacity) {
   bool schedule_draw = (opacity != opacity_ && IsDrawn());
   opacity_ = opacity;
 
   if (visible_)
-    web_layer_->setOpacity(opacity);
+    cc_layer_->setOpacity(opacity);
   if (schedule_draw)
     ScheduleDraw();
 }
 
 void Layer::SetVisibilityImmediately(bool visible) {
   if (visible_ == visible)
     return;
 
   visible_ = visible;
   // TODO(piman): Expose a visibility flag on WebLayer.
-  web_layer_->setOpacity(visible_ ? opacity_ : 0.f);
+  cc_layer_->setOpacity(visible_ ? opacity_ : 0.f);
 }
 
 void Layer::SetBrightnessImmediately(float brightness) {
   layer_brightness_ = brightness;
   SetLayerFilters();
 }
 
 void Layer::SetGrayscaleImmediately(float grayscale) {
   layer_grayscale_ = grayscale;
   SetLayerFilters();
@@ skipping 60 matching lines @@
 
 float Layer::GetGrayscaleForAnimation() const {
   return layer_grayscale();
 }
 
 SkColor Layer::GetColorForAnimation() const {
   // WebColor is equivalent to SkColor, per WebColor.h.
   // The NULL check is here since this is invoked regardless of whether we have
   // been configured as LAYER_SOLID_COLOR.
   return solid_color_layer_.get() ?
-      solid_color_layer_->layer()->backgroundColor() : SK_ColorBLACK;
+      solid_color_layer_->backgroundColor() : SK_ColorBLACK;
 }
 
 void Layer::CreateWebLayer() {
-  WebKit::WebCompositorSupport* compositor_support =
-      WebKit::Platform::current()->compositorSupport();
   if (type_ == LAYER_SOLID_COLOR) {
-    solid_color_layer_.reset(compositor_support->createSolidColorLayer());
-    web_layer_ = solid_color_layer_->layer();
+    solid_color_layer_ = cc::SolidColorLayer::create();
+    cc_layer_ = solid_color_layer_.get();
   } else {
-    content_layer_.reset(compositor_support->createContentLayer(this));
-    web_layer_ = content_layer_->layer();
+    content_layer_ = cc::ContentLayer::create(this);
+    cc_layer_ = content_layer_.get();
   }
-  web_layer_is_accelerated_ = false;
-  web_layer_->setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
-  web_layer_->setOpaque(true);
+  cc_layer_is_accelerated_ = false;
+  cc_layer_->setAnchorPoint(gfx::PointF());
+  cc_layer_->setContentsOpaque(true);
+  cc_layer_->setIsDrawable(type_ != LAYER_NOT_DRAWN);
 }
 
 void Layer::RecomputeTransform() {
   gfx::Transform scale_translate;
   scale_translate.matrix().set3x3(device_scale_factor_, 0, 0,
                                   0, device_scale_factor_, 0,
                                   0, 0, 1);
   // Start with the inverse matrix of above.
   gfx::Transform transform;
   transform.matrix().set3x3(1.0f / device_scale_factor_, 0, 0,
                             0, 1.0f / device_scale_factor_, 0,
                             0, 0, 1);
   transform.ConcatTransform(transform_);
   transform.ConcatTranslate(bounds_.x(), bounds_.y());
   transform.ConcatTransform(scale_translate);
-  web_layer_->setTransform(transform.matrix());
+  cc_layer_->setTransform(WebKit::WebTransformationMatrix(transform));
 }
 
 void Layer::RecomputeDrawsContentAndUVRect() {
-  DCHECK(web_layer_);
-  bool should_draw = type_ != LAYER_NOT_DRAWN;
-  if (!web_layer_is_accelerated_) {
-    if (type_ != LAYER_SOLID_COLOR) {
-      web_layer_->setDrawsContent(should_draw);
-    }
-    web_layer_->setBounds(ConvertSizeToPixel(this, bounds_.size()));
+  DCHECK(cc_layer_);
+  if (!cc_layer_is_accelerated_) {
+    cc_layer_->setBounds(ConvertSizeToPixel(this, bounds_.size()));
   } else {
     DCHECK(texture_);
 
     float texture_scale_factor = 1.0f / texture_->device_scale_factor();
     gfx::Size texture_size = gfx::ToFlooredSize(
         gfx::ScaleSize(texture_->size(), texture_scale_factor));
 
     gfx::Size size(std::min(bounds().width(), texture_size.width()),
                    std::min(bounds().height(), texture_size.height()));
-    WebKit::WebFloatRect rect(
+    gfx::RectF rect(
         0,
         0,
         static_cast<float>(size.width())/texture_size.width(),
         static_cast<float>(size.height())/texture_size.height());
     texture_layer_->setUVRect(rect);
 
-    gfx::Size size_in_pixel = ConvertSizeToPixel(this, size);
-    web_layer_->setBounds(size_in_pixel);
+    cc_layer_->setBounds(ConvertSizeToPixel(this, size));
   }
 }
 
 }  // namespace ui