ui/compositor: use cc/ directly instead of webkit

ui/compositor/layer_unittest.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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
+#include "cc/layer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/compositor_setup.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/test/test_compositor_host.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gfx/skia_util.h"
@@ skipping 662 matching lines @@
 
   NullLayerDelegate delegate;
   l1->set_delegate(&delegate);
   l2->set_delegate(&delegate);
   l3->set_delegate(&delegate);
 
   // Layers should initially be drawn.
   EXPECT_TRUE(l1->IsDrawn());
   EXPECT_TRUE(l2->IsDrawn());
   EXPECT_TRUE(l3->IsDrawn());
-  EXPECT_EQ(1.f, l1->web_layer()->opacity());
-  EXPECT_EQ(1.f, l2->web_layer()->opacity());
-  EXPECT_EQ(1.f, l3->web_layer()->opacity());
+  EXPECT_EQ(1.f, l1->cc_layer()->opacity());
+  EXPECT_EQ(1.f, l2->cc_layer()->opacity());
+  EXPECT_EQ(1.f, l3->cc_layer()->opacity());
 
   compositor()->SetRootLayer(l1.get());
 
   Draw();
 
   l1->SetVisible(false);
   EXPECT_FALSE(l1->IsDrawn());
   EXPECT_FALSE(l2->IsDrawn());
   EXPECT_FALSE(l3->IsDrawn());
-  EXPECT_EQ(0.f, l1->web_layer()->opacity());
+  EXPECT_EQ(0.f, l1->cc_layer()->opacity());
 
   l3->SetVisible(false);
   EXPECT_FALSE(l1->IsDrawn());
   EXPECT_FALSE(l2->IsDrawn());
   EXPECT_FALSE(l3->IsDrawn());
-  EXPECT_EQ(0.f, l3->web_layer()->opacity());
+  EXPECT_EQ(0.f, l3->cc_layer()->opacity());
 
   l1->SetVisible(true);
   EXPECT_TRUE(l1->IsDrawn());
   EXPECT_TRUE(l2->IsDrawn());
   EXPECT_FALSE(l3->IsDrawn());
-  EXPECT_EQ(1.f, l1->web_layer()->opacity());
+  EXPECT_EQ(1.f, l1->cc_layer()->opacity());
 }
 
 // Checks that stacking-related methods behave as advertised.
 TEST_F(LayerWithNullDelegateTest, Stacking) {
   scoped_ptr<Layer> root(new Layer(LAYER_NOT_DRAWN));
   scoped_ptr<Layer> l1(new Layer(LAYER_TEXTURED));
   scoped_ptr<Layer> l2(new Layer(LAYER_TEXTURED));
   scoped_ptr<Layer> l3(new Layer(LAYER_TEXTURED));
   l1->set_name("1");
   l2->set_name("2");
@@ skipping 388 matching lines @@
   l1_delegate.AddColor(SK_ColorWHITE);
   l1->set_delegate(&l1_delegate);
 
   GetCompositor()->SetScaleAndSize(1.0f, gfx::Size(500, 500));
   GetCompositor()->SetRootLayer(root.get());
   root->Add(l1.get());
   RunPendingMessages();
 
   EXPECT_EQ("10,20 200x220", root->bounds().ToString());
   EXPECT_EQ("10,20 140x180", l1->bounds().ToString());
-  gfx::Size size_in_pixel = root->web_layer()->bounds();
+  gfx::Size size_in_pixel = root->cc_layer()->bounds();
   EXPECT_EQ("200x220", size_in_pixel.ToString());
-  size_in_pixel = l1->web_layer()->bounds();
+  size_in_pixel = l1->cc_layer()->bounds();
   EXPECT_EQ("140x180", size_in_pixel.ToString());
   // No scale change, so no scale notification.
   EXPECT_EQ(0.0f, root_delegate.device_scale_factor());
   EXPECT_EQ(0.0f, l1_delegate.device_scale_factor());
 
   RunPendingMessages();
   EXPECT_EQ("200x220", root_delegate.paint_size().ToString());
   EXPECT_EQ("140x180", l1_delegate.paint_size().ToString());
 
   // Scale up to 2.0. Changing scale doesn't change the bounds in DIP.
   GetCompositor()->SetScaleAndSize(2.0f, gfx::Size(500, 500));
   EXPECT_EQ("10,20 200x220", root->bounds().ToString());
   EXPECT_EQ("10,20 140x180", l1->bounds().ToString());
   // Pixel size must have been scaled up.
-  size_in_pixel = root->web_layer()->bounds();
+  size_in_pixel = root->cc_layer()->bounds();
   EXPECT_EQ("400x440", size_in_pixel.ToString());
-  size_in_pixel = l1->web_layer()->bounds();
+  size_in_pixel = l1->cc_layer()->bounds();
   EXPECT_EQ("280x360", size_in_pixel.ToString());
   // New scale factor must have been notified.
   EXPECT_EQ(2.0f, root_delegate.device_scale_factor());
   EXPECT_EQ(2.0f, l1_delegate.device_scale_factor());
 
   // Canvas size must have been scaled down up.
   RunPendingMessages();
   EXPECT_EQ("400x440", root_delegate.paint_size().ToString());
   EXPECT_EQ("2.0 2.0", root_delegate.ToScaleString());
   EXPECT_EQ("280x360", l1_delegate.paint_size().ToString());
   EXPECT_EQ("2.0 2.0", l1_delegate.ToScaleString());
 
   // Scale down back to 1.0f.
   GetCompositor()->SetScaleAndSize(1.0f, gfx::Size(500, 500));
   EXPECT_EQ("10,20 200x220", root->bounds().ToString());
   EXPECT_EQ("10,20 140x180", l1->bounds().ToString());
   // Pixel size must have been scaled down.
-  size_in_pixel = root->web_layer()->bounds();
+  size_in_pixel = root->cc_layer()->bounds();
   EXPECT_EQ("200x220", size_in_pixel.ToString());
-  size_in_pixel = l1->web_layer()->bounds();
+  size_in_pixel = l1->cc_layer()->bounds();
   EXPECT_EQ("140x180", size_in_pixel.ToString());
   // New scale factor must have been notified.
   EXPECT_EQ(1.0f, root_delegate.device_scale_factor());
   EXPECT_EQ(1.0f, l1_delegate.device_scale_factor());
 
   // Canvas size must have been scaled down too.
   RunPendingMessages();
   EXPECT_EQ("200x220", root_delegate.paint_size().ToString());
   EXPECT_EQ("1.0 1.0", root_delegate.ToScaleString());
   EXPECT_EQ("140x180", l1_delegate.paint_size().ToString());
@@ skipping 22 matching lines @@
   TestLayerDelegate l1_delegate;
   l1_delegate.AddColor(SK_ColorWHITE);
   l1->set_delegate(&l1_delegate);
 
   GetCompositor()->SetScaleAndSize(1.0f, gfx::Size(500, 500));
   GetCompositor()->SetRootLayer(root.get());
   RunPendingMessages();
 
   root->Add(l1.get());
   EXPECT_EQ("10,20 140x180", l1->bounds().ToString());
-  gfx::Size size_in_pixel = l1->web_layer()->bounds();
+  gfx::Size size_in_pixel = l1->cc_layer()->bounds();
   EXPECT_EQ("140x180", size_in_pixel.ToString());
   EXPECT_EQ(0.0f, l1_delegate.device_scale_factor());
 
   RunPendingMessages();
   EXPECT_EQ("140x180", l1_delegate.paint_size().ToString());
   EXPECT_EQ("1.0 1.0", l1_delegate.ToScaleString());
 
   // Remove l1 from root and change the scale.
   root->Remove(l1.get());
   EXPECT_EQ(NULL, l1->parent());
   EXPECT_EQ(NULL, l1->GetCompositor());
   GetCompositor()->SetScaleAndSize(2.0f, gfx::Size(500, 500));
   // Sanity check on root and l1.
   EXPECT_EQ("10,20 200x220", root->bounds().ToString());
-  size_in_pixel = l1->web_layer()->bounds();
+  size_in_pixel = l1->cc_layer()->bounds();
   EXPECT_EQ("140x180", size_in_pixel.ToString());
 
 
   root->Add(l1.get());
   EXPECT_EQ("10,20 140x180", l1->bounds().ToString());
-  size_in_pixel = l1->web_layer()->bounds();
+  size_in_pixel = l1->cc_layer()->bounds();
   EXPECT_EQ("280x360", size_in_pixel.ToString());
   EXPECT_EQ(2.0f, l1_delegate.device_scale_factor());
   RunPendingMessages();
   EXPECT_EQ("280x360", l1_delegate.paint_size().ToString());
   EXPECT_EQ("2.0 2.0", l1_delegate.ToScaleString());
 }
 
 // Tests layer::set_scale_content(false).
 TEST_F(LayerWithRealCompositorTest, MAYBE_NoScaleCanvas) {
   scoped_ptr<Layer> root(CreateColorLayer(SK_ColorWHITE,
@@ skipping 54 matching lines @@
 
   // Resize layer.
   child->SetBounds(gfx::Rect(200, 200, 400, 400));
   child->SetVisible(true);
   EXPECT_TRUE(schedule_draw_invoked_);
   DrawTree(root.get());
   EXPECT_TRUE(delegate.painted());
 }
 
 }  // namespace ui