aura: Add Layer::LAYER_SOLID_COLOR to compositor.

ui/gfx/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"
@@ skipping 104 matching lines @@
 // - LayerWithNullDelegateTest uses NullLayerDelegate as the LayerDelegate. This
 //   is typically the base class you want to use.
 // - LayerWithDelegateTest uses LayerDelegate on the delegates.
 // - LayerWithRealCompositorTest when a real compositor is required for testing.
 //    - Slow because they bring up a window and run the real compositor. This
 //      is typically not what you want.
 
 class ColoredLayer : public Layer, public LayerDelegate {
  public:
   explicit ColoredLayer(SkColor color)
-      : Layer(Layer::LAYER_HAS_TEXTURE),
+      : Layer(Layer::LAYER_TEXTURED),
         color_(color) {
     set_delegate(this);
   }
 
   virtual ~ColoredLayer() { }
 
   // Overridden from LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
     canvas->GetSkCanvas()->drawColor(color_);
   }
@@ skipping 34 matching lines @@
     return new Layer(type);
   }
 
   Layer* CreateColorLayer(SkColor color, const gfx::Rect& bounds) {
     Layer* layer = new ColoredLayer(color);
     layer->SetBounds(bounds);
     return layer;
   }
 
   Layer* CreateNoTextureLayer(const gfx::Rect& bounds) {
-    Layer* layer = CreateLayer(Layer::LAYER_HAS_NO_TEXTURE);
+    Layer* layer = CreateLayer(Layer::LAYER_NOT_DRAWN);
     layer->SetBounds(bounds);
     return layer;
   }
 
   gfx::Canvas* CreateCanvasForLayer(const Layer* layer) {
     return gfx::Canvas::CreateCanvas(layer->bounds().size(), false);
   }
 
   void DrawTree(Layer* root) {
     GetCompositor()->SetRootLayer(root);
@@ skipping 193 matching lines @@
     return new Layer(type);
   }
 
   Layer* CreateColorLayer(SkColor color, const gfx::Rect& bounds) {
     Layer* layer = new ColoredLayer(color);
     layer->SetBounds(bounds);
     return layer;
   }
 
   virtual Layer* CreateNoTextureLayer(const gfx::Rect& bounds) {
-    Layer* layer = CreateLayer(Layer::LAYER_HAS_NO_TEXTURE);
+    Layer* layer = CreateLayer(Layer::LAYER_NOT_DRAWN);
     layer->SetBounds(bounds);
     return layer;
   }
 
   gfx::Canvas* CreateCanvasForLayer(const Layer* layer) {
     return gfx::Canvas::CreateCanvas(layer->bounds().size(), false);
   }
 
   void DrawTree(Layer* root) {
     compositor()->SetRootLayer(root);
@@ skipping 185 matching lines @@
     return layer;
   }
 
   Layer* CreateTextureRootLayer(const gfx::Rect& bounds) {
     Layer* layer = CreateTextureLayer(bounds);
     compositor()->SetRootLayer(layer);
     return layer;
   }
 
   Layer* CreateTextureLayer(const gfx::Rect& bounds) {
-    Layer* layer = CreateLayer(Layer::LAYER_HAS_TEXTURE);
+    Layer* layer = CreateLayer(Layer::LAYER_TEXTURED);
     layer->SetBounds(bounds);
     return layer;
   }
 
   Layer* CreateNoTextureLayer(const gfx::Rect& bounds) OVERRIDE {
-    Layer* layer = CreateLayer(Layer::LAYER_HAS_NO_TEXTURE);
+    Layer* layer = CreateLayer(Layer::LAYER_NOT_DRAWN);
     layer->SetBounds(bounds);
     return layer;
   }
 
   void RunPendingMessages() {
     MessageLoopForUI::current()->RunAllPending();
   }
 
  private:
   scoped_ptr<NullLayerDelegate> default_layer_delegate_;
@@ skipping 344 matching lines @@
 }
 
 // Create this hierarchy:
 // L1 (no texture)
 //  +- L11 (texture)
 //  +- L12 (no texture) (added after L1 is already set as root-layer)
 //    +- L121 (texture)
 //    +- L122 (texture)
 TEST_F(LayerWithNullDelegateTest,
        NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(NoCompositor)) {
-  scoped_ptr<Layer> l1(CreateLayer(Layer::LAYER_HAS_NO_TEXTURE));
-  scoped_ptr<Layer> l11(CreateLayer(Layer::LAYER_HAS_TEXTURE));
-  scoped_ptr<Layer> l12(CreateLayer(Layer::LAYER_HAS_NO_TEXTURE));
-  scoped_ptr<Layer> l121(CreateLayer(Layer::LAYER_HAS_TEXTURE));
-  scoped_ptr<Layer> l122(CreateLayer(Layer::LAYER_HAS_TEXTURE));
+  scoped_ptr<Layer> l1(CreateLayer(Layer::LAYER_NOT_DRAWN));
+  scoped_ptr<Layer> l11(CreateLayer(Layer::LAYER_TEXTURED));
+  scoped_ptr<Layer> l12(CreateLayer(Layer::LAYER_NOT_DRAWN));
+  scoped_ptr<Layer> l121(CreateLayer(Layer::LAYER_TEXTURED));
+  scoped_ptr<Layer> l122(CreateLayer(Layer::LAYER_TEXTURED));
 
   EXPECT_EQ(NULL, l1->texture());
   EXPECT_EQ(NULL, l11->texture());
   EXPECT_EQ(NULL, l12->texture());
   EXPECT_EQ(NULL, l121->texture());
   EXPECT_EQ(NULL, l122->texture());
 
   l1->Add(l11.get());
   l1->SetBounds(gfx::Rect(0, 0, 500, 500));
   l11->SetBounds(gfx::Rect(5, 5, 490, 490));
 
   EXPECT_EQ(NULL, l11->texture());
 
   compositor()->SetRootLayer(l1.get());
 
   EXPECT_EQ(NULL, l1->texture());
 
-  // Despite having type LAYER_HAS_TEXTURE, l11 will not have one set yet
+  // Despite having type LAYER_TEXTURED, l11 will not have one set yet
   // because it has never been asked to draw.
   EXPECT_EQ(NULL, l11->texture());
 
   l12->Add(l121.get());
   l12->Add(l122.get());
   l12->SetBounds(gfx::Rect(5, 5, 480, 480));
   l121->SetBounds(gfx::Rect(5, 5, 100, 100));
   l122->SetBounds(gfx::Rect(110, 110, 100, 100));
 
   EXPECT_EQ(NULL, l121->texture());
@@ skipping 12 matching lines @@
 
   // Toggling l2's visibility should drop all sub-layer textures.
   l12->SetVisible(false);
   EXPECT_EQ(NULL, l12->texture());
   EXPECT_EQ(NULL, l121->texture());
   EXPECT_EQ(NULL, l122->texture());
 }
 
 // Various visibile/drawn assertions.
 TEST_F(LayerWithNullDelegateTest, Visibility) {
-  scoped_ptr<Layer> l1(new Layer(Layer::LAYER_HAS_TEXTURE));
-  scoped_ptr<Layer> l2(new Layer(Layer::LAYER_HAS_TEXTURE));
-  scoped_ptr<Layer> l3(new Layer(Layer::LAYER_HAS_TEXTURE));
+  scoped_ptr<Layer> l1(new Layer(Layer::LAYER_TEXTURED));
+  scoped_ptr<Layer> l2(new Layer(Layer::LAYER_TEXTURED));
+  scoped_ptr<Layer> l3(new Layer(Layer::LAYER_TEXTURED));
   l1->Add(l2.get());
   l2->Add(l3.get());
 
   NullLayerDelegate delegate;
   l1->set_delegate(&delegate);
   l2->set_delegate(&delegate);
   l3->set_delegate(&delegate);
 
   // Layers should initially be drawn.
   EXPECT_TRUE(l1->IsDrawn());
@@ skipping 29 matching lines @@
   EXPECT_TRUE(l1->IsDrawn());
   EXPECT_TRUE(l2->IsDrawn());
   EXPECT_FALSE(l3->IsDrawn());
 #if defined(USE_WEBKIT_COMPOSITOR)
   EXPECT_EQ(1.f, l1->web_layer().opacity());
 #endif
 }
 
 // Checks that stacking-related methods behave as advertised.
 TEST_F(LayerWithNullDelegateTest, Stacking) {
-  scoped_ptr<Layer> root(new Layer(Layer::LAYER_HAS_NO_TEXTURE));
-  scoped_ptr<Layer> l1(new Layer(Layer::LAYER_HAS_TEXTURE));
-  scoped_ptr<Layer> l2(new Layer(Layer::LAYER_HAS_TEXTURE));
-  scoped_ptr<Layer> l3(new Layer(Layer::LAYER_HAS_TEXTURE));
+  scoped_ptr<Layer> root(new Layer(Layer::LAYER_NOT_DRAWN));
+  scoped_ptr<Layer> l1(new Layer(Layer::LAYER_TEXTURED));
+  scoped_ptr<Layer> l2(new Layer(Layer::LAYER_TEXTURED));
+  scoped_ptr<Layer> l3(new Layer(Layer::LAYER_TEXTURED));
   l1->set_name("1");
   l2->set_name("2");
   l3->set_name("3");
   root->Add(l3.get());
   root->Add(l2.get());
   root->Add(l1.get());
 
   // Layers' children are stored in bottom-to-top order.
   EXPECT_EQ("3,2,1", GetLayerChildrenNames(*root.get()));
 
@@ skipping 366 matching lines @@
   EXPECT_TRUE(schedule_draw_invoked_);
   // Because SchedulePaint() was invoked from OnPaintLayer() |child| should
   // still need to be painted.
   DrawTree(root.get());
   EXPECT_EQ(1, child_delegate.GetPaintCountAndClear());
   EXPECT_TRUE(child_delegate.last_clip_rect().Contains(
                   gfx::Rect(10, 10, 30, 30)));
 }
 
 } // namespace ui