cc: turn on strict paint property checking

cc/trees/layer_tree_host_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/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 1543 matching lines @@
   }
 
   void AfterTest() override { EXPECT_EQ(1, num_draws_); }
 
  private:
   int num_draws_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestSetVisible);
 
-class TestOpacityChangeLayerDelegate : public ContentLayerClient {
- public:
-  TestOpacityChangeLayerDelegate() : test_layer_(0) {}
-
-  void SetTestLayer(Layer* test_layer) { test_layer_ = test_layer; }
-
-  gfx::Rect PaintableRegion() override {
-    return gfx::Rect(test_layer_->bounds());
-  }
-  scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
-      PaintingControlSetting picture_control) override {
-    // Set layer opacity to 0.
-    if (test_layer_)
-      test_layer_->SetOpacity(0.f);
-
-    // Return a dummy display list.
-    scoped_refptr<DisplayItemList> display_list =
-        DisplayItemList::Create(PaintableRegion(), DisplayItemListSettings());
-    return display_list;
-  }
-  bool FillsBoundsCompletely() const override { return false; }
-  size_t GetApproximateUnsharedMemoryUsage() const override { return 0; }
-
- private:
-  Layer* test_layer_;
-};
-
-// Layer opacity change during paint should not prevent compositor resources
-// from being updated during commit.
-class LayerTreeHostTestOpacityChange : public LayerTreeHostTest {
- public:
-  LayerTreeHostTestOpacityChange() : test_opacity_change_delegate_() {}
-
-  void SetupTree() override {
-    LayerTreeHostTest::SetupTree();
-
-    update_check_picture_layer_ = FakePictureLayer::Create(
-        layer_settings(), &test_opacity_change_delegate_);
-    test_opacity_change_delegate_.SetTestLayer(
-        update_check_picture_layer_.get());
-    layer_tree_host()->root_layer()->AddChild(update_check_picture_layer_);
-  }
-
-  void BeginTest() override { PostSetNeedsCommitToMainThread(); }
-
-  void CommitCompleteOnThread(LayerTreeHostImpl* impl) override { EndTest(); }
-
-  void AfterTest() override {
-    // Update() should have been called once.
-    EXPECT_EQ(1, update_check_picture_layer_->update_count());
-  }
-
- private:
-  TestOpacityChangeLayerDelegate test_opacity_change_delegate_;
-  scoped_refptr<FakePictureLayer> update_check_picture_layer_;
-};
-
-MULTI_THREAD_TEST_F(LayerTreeHostTestOpacityChange);
-
 class LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers
     : public LayerTreeHostTest {
  public:
   LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers() {}
 
   void BeginTest() override {
     client_.set_fill_with_nonsolid_color(true);
     root_layer_ = FakePictureLayer::Create(layer_settings(), &client_);
     child_layer_ = FakePictureLayer::Create(layer_settings(), &client_);
 
@@ skipping 526 matching lines @@
   }
 
   void AfterTest() override {}
 
   FakeContentLayerClient client_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostTestUninvertibleTransformDoesNotBlockActivation);
 
-class LayerTreeHostTestChangeLayerPropertiesInPaintContents
-    : public LayerTreeHostTest {
- public:
-  class SetBoundsClient : public ContentLayerClient {
-   public:
-    SetBoundsClient() : layer_(0) {}
-
-    void set_layer(Layer* layer) { layer_ = layer; }
-
-    gfx::Rect PaintableRegion() override { return gfx::Rect(layer_->bounds()); }
-
-    scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
-        PaintingControlSetting picture_control) override {
-      layer_->SetBounds(gfx::Size(2, 2));
-
-      // Return a dummy display list.
-      scoped_refptr<DisplayItemList> display_list =
-          DisplayItemList::Create(PaintableRegion(), DisplayItemListSettings());
-      return display_list;
-    }
-
-    bool FillsBoundsCompletely() const override { return false; }
-    size_t GetApproximateUnsharedMemoryUsage() const override { return 0; }
-
-   private:
-    Layer* layer_;
-  };
-
-  LayerTreeHostTestChangeLayerPropertiesInPaintContents() : num_commits_(0) {}
-
-  void SetupTree() override {
-    scoped_refptr<PictureLayer> root_layer =
-        PictureLayer::Create(layer_settings(), &client_);
-    root_layer->SetIsDrawable(true);
-    root_layer->SetBounds(gfx::Size(1, 1));
-    client_.set_layer(root_layer.get());
-
-    layer_tree_host()->SetRootLayer(root_layer);
-    LayerTreeHostTest::SetupTree();
-  }
-
-  void BeginTest() override { PostSetNeedsCommitToMainThread(); }
-  void AfterTest() override {}
-
-  void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) override {
-    num_commits_++;
-    if (num_commits_ == 1) {
-      LayerImpl* root_layer = host_impl->active_tree()->root_layer();
-      EXPECT_EQ(gfx::Size(1, 1), root_layer->bounds());
-    } else {
-      LayerImpl* root_layer = host_impl->active_tree()->root_layer();
-      EXPECT_EQ(gfx::Size(2, 2), root_layer->bounds());
-      EndTest();
-    }
-  }
-
- private:
-  SetBoundsClient client_;
-  int num_commits_;
-};
-
-SINGLE_AND_MULTI_THREAD_TEST_F(
-    LayerTreeHostTestChangeLayerPropertiesInPaintContents);
-
 class MockIOSurfaceWebGraphicsContext3D : public TestWebGraphicsContext3D {
  public:
   MockIOSurfaceWebGraphicsContext3D() {
     test_capabilities_.gpu.iosurface = true;
     test_capabilities_.gpu.texture_rectangle = true;
   }
 
   GLuint createTexture() override { return 1; }
   MOCK_METHOD1(activeTexture, void(GLenum texture));
   MOCK_METHOD2(bindTexture, void(GLenum target,
@@ skipping 4302 matching lines @@
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor);
 
 }  // namespace
 }  // namespace cc