A fix for LayerNoTextureSetFillsBoundsOpaquely.

ui/gfx/compositor/layer_unittest.cc

 // Copyright (c) 2011 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/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/compositor_observer.h"
@@ skipping 447 matching lines @@
     layer->SetBounds(bounds);
     return layer;
   }
 
   Layer* CreateNoTextureLayer(const gfx::Rect& bounds) OVERRIDE {
     Layer* layer = CreateLayer(Layer::LAYER_HAS_NO_TEXTURE);
     layer->SetBounds(bounds);
     return layer;
   }
 
+  void RunPendingMessages() {
+    MessageLoopForUI::current()->RunAllPending();
+  }
+
  private:
   scoped_ptr<NullLayerDelegate> default_layer_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerWithNullDelegateTest);
 };
 
+// With the webkit compositor, we don't explicitly textures for layers, making
+// tests that check that we do fail.
+#if defined(USE_WEBKIT_COMPOSITOR)
+#define NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(X) DISABLED_ ## X
+#else
+#define NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(X) X
+#endif
+
 // Verifies that a layer which is set never to have a texture does not
 // get a texture when SetFillsBoundsOpaquely is called.
-TEST_F(LayerWithNullDelegateTest, LayerNoTextureSetFillsBoundsOpaquely) {
+TEST_F(LayerWithNullDelegateTest,
+       NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(
+           LayerNoTextureSetFillsBoundsOpaquely)) {
   scoped_ptr<Layer> parent(CreateNoTextureLayer(gfx::Rect(0, 0, 400, 400)));
   scoped_ptr<Layer> child(CreateNoTextureLayer(gfx::Rect(50, 50, 100, 100)));
   parent->Add(child.get());
 
   compositor()->SetRootLayer(parent.get());
+  parent->SetFillsBoundsOpaquely(true);
+  child->SetFillsBoundsOpaquely(true);
   Draw();
+  RunPendingMessages();
+  EXPECT_TRUE(child->texture() == NULL);
+  EXPECT_TRUE(parent->texture() == NULL);
+
+  parent->SetFillsBoundsOpaquely(false);
+  child->SetFillsBoundsOpaquely(false);
+  Draw();
+  RunPendingMessages();
   EXPECT_TRUE(child->texture() == NULL);
   EXPECT_TRUE(parent->texture() == NULL);
 }
 
-// With the webkit compositor, we don't explicitly textures for layers, making
-// tests that check that we do fail.
-#if defined(USE_WEBKIT_COMPOSITOR)
-#define WEBKIT_COMPOSITOR_FAILS(X) FAILS_ ## X
-#else
-#define WEBKIT_COMPOSITOR_FAILS(X) X
-#endif
-
 // Verifies that a layer does not have a texture when the hole is the size
 // of the parent layer.
 TEST_F(LayerWithNullDelegateTest,
-       WEBKIT_COMPOSITOR_FAILS(LayerNoTextureHoleSizeOfLayer)) {
+       NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(LayerNoTextureHoleSizeOfLayer)) {
   scoped_ptr<Layer> parent(CreateTextureRootLayer(gfx::Rect(0, 0, 400, 400)));
   scoped_ptr<Layer> child(CreateTextureLayer(gfx::Rect(50, 50, 100, 100)));
   parent->Add(child.get());
 
   Draw();
   EXPECT_EQ(gfx::Rect(50, 50, 100, 100), parent->hole_rect());
   EXPECT_TRUE(parent->texture() != NULL);
 
   child->SetBounds(gfx::Rect(0, 0, 400, 400));
   Draw();
   EXPECT_TRUE(parent->texture() == NULL);
 }
 
 // Verifies that a layer which has opacity == 0 does not have a texture.
 TEST_F(LayerWithNullDelegateTest,
-       WEBKIT_COMPOSITOR_FAILS(LayerNoTextureTransparent)) {
+       NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(LayerNoTextureTransparent)) {
   scoped_ptr<Layer> parent(CreateTextureRootLayer(gfx::Rect(0, 0, 400, 400)));
   scoped_ptr<Layer> child(CreateTextureLayer(gfx::Rect(50, 50, 100, 100)));
   parent->Add(child.get());
 
   parent->SetOpacity(0.0f);
   child->SetOpacity(0.0f);
   Draw();
   EXPECT_TRUE(parent->texture() == NULL);
   EXPECT_TRUE(child->texture() == NULL);
 
   parent->SetOpacity(1.0f);
   Draw();
   EXPECT_TRUE(parent->texture() != NULL);
   EXPECT_TRUE(child->texture() == NULL);
 
   child->SetOpacity(1.0f);
   Draw();
   EXPECT_TRUE(parent->texture() != NULL);
   EXPECT_TRUE(child->texture() != NULL);
 }
 
 // Verifies that no texture is created for a layer with empty bounds.
 TEST_F(LayerWithNullDelegateTest,
-       WEBKIT_COMPOSITOR_FAILS(LayerTextureNonEmptySchedulePaint)) {
+       NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(LayerTextureNonEmptySchedulePaint)) {
   scoped_ptr<Layer> layer(CreateTextureRootLayer(gfx::Rect(0, 0, 0, 0)));
   Draw();
   EXPECT_TRUE(layer->texture() == NULL);
 
   layer->SetBounds(gfx::Rect(0, 0, 400, 400));
   Draw();
   EXPECT_TRUE(layer->texture() != NULL);
 }
 
 // Verifies that when there are many potential holes, the largest one is picked.
@@ skipping 64 matching lines @@
     EXPECT_EQ(target_rect, parent->hole_rect());
   }
 }
 
 // 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, WEBKIT_COMPOSITOR_FAILS(NoCompositor)) {
+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));
 
   EXPECT_EQ(NULL, l1->texture());
   EXPECT_EQ(NULL, l11->texture());
   EXPECT_EQ(NULL, l12->texture());
   EXPECT_EQ(NULL, l121->texture());
@@ skipping 88 matching lines @@
   EXPECT_TRUE(l2->IsDrawn());
   EXPECT_FALSE(l3->IsDrawn());
 #if defined(USE_WEBKIT_COMPOSITOR)
   EXPECT_EQ(1.f, l1->web_layer().opacity());
 #endif
 }
 
 // Checks that the invalid rect assumes correct values when setting bounds.
 // TODO(vollick): for USE_WEBKIT_COMPOSITOR, use WebKit's dirty rect.
 TEST_F(LayerWithNullDelegateTest,
-       WEBKIT_COMPOSITOR_FAILS(SetBoundsInvalidRect)) {
+       NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(SetBoundsInvalidRect)) {
   scoped_ptr<Layer> l1(CreateTextureLayer(gfx::Rect(0, 0, 200, 200)));
   compositor()->SetRootLayer(l1.get());
 
   // After a draw the invalid rect should be empty.
   Draw();
   EXPECT_TRUE(l1->invalid_rect().IsEmpty());
 
   // After a move the invalid rect should be empty.
   l1->SetBounds(gfx::Rect(5, 5, 200, 200));
   EXPECT_TRUE(l1->invalid_rect().IsEmpty());
@@ skipping 38 matching lines @@
   SkAutoLockPixels lock(bitmap);
   bool is_all_red = true;
   for (int x = 0; is_all_red && x < 500; x++)
     for (int y = 0; is_all_red && y < 500; y++)
       is_all_red = is_all_red && (bitmap.getColor(x, y) == SK_ColorRED);
 
   EXPECT_TRUE(is_all_red);
 }
 
 } // namespace ui