Removing the assumption that child->SetParent will not change Drawability

cc/layers/layer_unittest.cc

 // Copyright 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 "cc/layers/layer.h"
 
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/resources/layer_painter.h"
@@ skipping 38 matching lines @@
   MOCK_METHOD0(SetNeedsFullTreeSync, void());
 };
 
 class MockLayerPainter : public LayerPainter {
  public:
   virtual void Paint(SkCanvas* canvas,
                      const gfx::Rect& content_rect,
                      gfx::RectF* opaque) OVERRIDE {}
 };
 
+class DrawsContentChangeLayer : public Layer {

[danakj, 2014/08/15 15:40:30]

Can you put this just above the test so it's closer to where it's used?

[awoloszyn, 2014/08/15 15:56:46]

Done.

+ public:
+  static scoped_refptr<DrawsContentChangeLayer> Create() {
+    return make_scoped_refptr(new DrawsContentChangeLayer());
+  }
+
+  virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE {
+    Layer::SetLayerTreeHost(host);
+    SetFakeDrawsContent(!fake_draws_content_);
+  }
+
+  virtual bool HasDrawableContent() const OVERRIDE {
+    return fake_draws_content_ && Layer::HasDrawableContent();
+  }
+
+  void SetFakeDrawsContent(bool fake_draws_content) {
+    fake_draws_content_ = fake_draws_content;
+    UpdateDrawsContent(HasDrawableContent());
+  }
+
+ private:
+  bool fake_draws_content_;

[danakj, 2014/08/15 15:40:30]

move variable below methods, and a blank line between

[awoloszyn, 2014/08/15 15:56:45]

Done.

+  DrawsContentChangeLayer() : Layer(), fake_draws_content_(false) {}
+  virtual ~DrawsContentChangeLayer() OVERRIDE {}
+};
 
 class LayerTest : public testing::Test {
  public:
   LayerTest()
       : host_impl_(&proxy_, &shared_bitmap_manager_),
         fake_client_(FakeLayerTreeHostClient::DIRECT_3D) {}
 
  protected:
   virtual void SetUp() OVERRIDE {
     layer_tree_host_.reset(new StrictMock<MockLayerTreeHost>(&fake_client_));
@@ skipping 1076 matching lines @@
         } else {
           EXPECT_NE(SkColorGetA(safe_color), 255u)
               << "Flags: " << contents_opaque << ", " << layer_opaque << ", "
               << host_opaque << "\n";
         }
       }
     }
   }
 }
 
+TEST_F(LayerTest, DrawsContentChangedInSetLayerTreeHost) {
+  scoped_refptr<Layer> root_layer = Layer::Create();
+  scoped_refptr<DrawsContentChangeLayer> child_layer =

[danakj, 2014/08/15 15:40:30]

becomes_not_draws_content

[awoloszyn, 2014/08/15 15:56:46]

Done.

+      DrawsContentChangeLayer::Create();
+  scoped_refptr<DrawsContentChangeLayer> second_child =

[danakj, 2014/08/15 15:40:30]

becomes_draws_content

[awoloszyn, 2014/08/15 15:56:46]

Done.

+      DrawsContentChangeLayer::Create();
+  root_layer->SetIsDrawable(true);
+  child_layer->SetIsDrawable(true);
+  child_layer->SetFakeDrawsContent(true);
+  EXPECT_EQ(0, root_layer->NumDescendantsThatDrawContent());
+  root_layer->AddChild(child_layer);
+  EXPECT_EQ(0, root_layer->NumDescendantsThatDrawContent());
+
+  second_child->SetIsDrawable(true);
+  root_layer->AddChild(second_child);
+  EXPECT_EQ(1, root_layer->NumDescendantsThatDrawContent());
+}
+
 }  // namespace
 }  // namespace cc