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);
 };
 
 // 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) {
   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);

[sky, 2011/11/10 20:20:53]

Why should this matter if the layer has texture?

+  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
@@ skipping 289 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