Cache gpu suitability in DisplayItemList, remove SetUnsuitable...ForTesting

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 4354 matching lines @@
 class LayerTreeHostTestGpuRasterizationDefault : public LayerTreeHostTest {
  protected:
   void InitializeSettings(LayerTreeSettings* settings) override {
     EXPECT_FALSE(settings->gpu_rasterization_enabled);
     EXPECT_FALSE(settings->gpu_rasterization_forced);
   }
 
   void SetupTree() override {
     LayerTreeHostTest::SetupTree();
 
-    scoped_refptr<PictureLayer> layer =
-        PictureLayer::Create(layer_settings(), &layer_client_);
+    scoped_ptr<FakeDisplayListRecordingSource> recording_source(
+        new FakeDisplayListRecordingSource(gfx::Size(10, 10)));
+    recording_source_ = recording_source.get();
+
+    scoped_refptr<FakePictureLayer> layer =
+        FakePictureLayer::CreateWithRecordingSource(
+            layer_settings(), &layer_client_, recording_source.Pass());
+    layer_ = layer.get();
     layer->SetBounds(gfx::Size(10, 10));
     layer->SetIsDrawable(true);
     layer_tree_host()->root_layer()->AddChild(layer);
   }
 
   void BeginTest() override {
-    Layer* root = layer_tree_host()->root_layer();
-    PictureLayer* layer = static_cast<PictureLayer*>(root->child_at(0));
-    RecordingSource* recording_source = layer->GetRecordingSourceForTesting();
-
-    // Verify default values.
-    EXPECT_TRUE(root->IsSuitableForGpuRasterization());
-    EXPECT_TRUE(layer->IsSuitableForGpuRasterization());
-    EXPECT_TRUE(recording_source->IsSuitableForGpuRasterization());
+    // Verify default value.
     EXPECT_FALSE(layer_tree_host()->has_gpu_rasterization_trigger());
 
     // Setting gpu rasterization trigger does not enable gpu rasterization.
     layer_tree_host()->SetHasGpuRasterizationTrigger(true);
     EXPECT_TRUE(layer_tree_host()->has_gpu_rasterization_trigger());
 
     PostSetNeedsCommitToMainThread();
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
+    EXPECT_TRUE(recording_source_->IsSuitableForGpuRasterization());
+    EXPECT_TRUE(layer_->IsSuitableForGpuRasterization());
+
     EXPECT_FALSE(host_impl->pending_tree()->use_gpu_rasterization());
     EXPECT_FALSE(host_impl->use_gpu_rasterization());
   }
 
   void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) override {
+    EXPECT_TRUE(recording_source_->IsSuitableForGpuRasterization());
+    EXPECT_TRUE(layer_->IsSuitableForGpuRasterization());
+
     EXPECT_FALSE(host_impl->active_tree()->use_gpu_rasterization());
     EXPECT_FALSE(host_impl->use_gpu_rasterization());
     EndTest();
   }
 
   void AfterTest() override {}
 
   FakeContentLayerClient layer_client_;
+  FakePictureLayer* layer_;
+  FakeDisplayListRecordingSource* recording_source_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterizationDefault);
 
 class LayerTreeHostTestGpuRasterizationEnabled : public LayerTreeHostTest {
  protected:
   void InitializeSettings(LayerTreeSettings* settings) override {
     EXPECT_FALSE(settings->gpu_rasterization_enabled);
     settings->gpu_rasterization_enabled = true;
   }
 
   void SetupTree() override {
     LayerTreeHostTest::SetupTree();
 
     scoped_ptr<FakeDisplayListRecordingSource> recording_source(
         new FakeDisplayListRecordingSource(gfx::Size(10, 10)));
+    recording_source_ = recording_source.get();
 
     scoped_refptr<FakePictureLayer> layer =
         FakePictureLayer::CreateWithRecordingSource(
             layer_settings(), &layer_client_, recording_source.Pass());
+    layer_ = layer.get();
     layer->SetBounds(gfx::Size(10, 10));
     layer->SetIsDrawable(true);
     layer_tree_host()->root_layer()->AddChild(layer);
   }
 
   void BeginTest() override {
-    Layer* root = layer_tree_host()->root_layer();
-    FakePictureLayer* layer = static_cast<FakePictureLayer*>(root->child_at(0));
-    FakeDisplayListRecordingSource* recording_source =
-        static_cast<FakeDisplayListRecordingSource*>(
-            layer->GetRecordingSourceForTesting());
-
-    // Verify default values.
-    EXPECT_TRUE(root->IsSuitableForGpuRasterization());
-    EXPECT_TRUE(layer->IsSuitableForGpuRasterization());
-    EXPECT_TRUE(recording_source->IsSuitableForGpuRasterization());
+    // Verify default value.
     EXPECT_FALSE(layer_tree_host()->has_gpu_rasterization_trigger());
 
     // Gpu rasterization trigger is relevant.
     layer_tree_host()->SetHasGpuRasterizationTrigger(true);
     EXPECT_TRUE(layer_tree_host()->has_gpu_rasterization_trigger());
 
     // Content-based veto is relevant as well.
-    recording_source->SetUnsuitableForGpuRasterizationForTesting();
-    EXPECT_FALSE(recording_source->IsSuitableForGpuRasterization());
-    EXPECT_FALSE(layer->IsSuitableForGpuRasterization());
+    recording_source_->SetUnsuitableForGpuRasterization();
+
     // Veto will take effect when layers are updated.
     // The results will be verified after commit is completed below.
-    // Since we are manually marking picture pile as unsuitable,
+    // Since we are manually marking the source as unsuitable,
     // make sure that the layer gets a chance to update.
-    layer->SetNeedsDisplay();
+    layer_->SetNeedsDisplay();
     PostSetNeedsCommitToMainThread();
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
+    // Ensure the suitability bit sticks.
+    EXPECT_FALSE(recording_source_->IsSuitableForGpuRasterization());

[hendrikw, 2015/09/21 18:36:46]

Same thing here

[danakj, 2015/09/21 18:43:27]

I think it's ok, it's testing the test which is a practice that I like. If we
changed the test harness somehow and this changed, but the layer still reported
false, that'd be something we want to know about. It also kinda documents what
we're thinking about here. The source is false, and that means the layer is
false.

+    EXPECT_FALSE(layer_->IsSuitableForGpuRasterization());
+
     EXPECT_FALSE(host_impl->pending_tree()->use_gpu_rasterization());
     EXPECT_FALSE(host_impl->use_gpu_rasterization());
   }
 
   void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) override {
+    EXPECT_FALSE(recording_source_->IsSuitableForGpuRasterization());

[hendrikw, 2015/09/21 18:36:46]

and here.

+    EXPECT_FALSE(layer_->IsSuitableForGpuRasterization());
+
     EXPECT_FALSE(host_impl->active_tree()->use_gpu_rasterization());
     EXPECT_FALSE(host_impl->use_gpu_rasterization());
     EndTest();
   }
 
   void AfterTest() override {}
 
   FakeContentLayerClient layer_client_;
+  FakePictureLayer* layer_;
+  FakeDisplayListRecordingSource* recording_source_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterizationEnabled);
 
 class LayerTreeHostTestGpuRasterizationForced : public LayerTreeHostTest {
  protected:
   void InitializeSettings(LayerTreeSettings* settings) override {
     EXPECT_FALSE(settings->gpu_rasterization_forced);
     settings->gpu_rasterization_forced = true;
   }
 
   void SetupTree() override {
     LayerTreeHostTest::SetupTree();
 
+    scoped_ptr<FakeDisplayListRecordingSource> recording_source(
+        new FakeDisplayListRecordingSource(gfx::Size(100, 100)));
+    recording_source_ = recording_source.get();
+
     scoped_refptr<FakePictureLayer> layer =
-        FakePictureLayer::Create(layer_settings(), &layer_client_);
+        FakePictureLayer::CreateWithRecordingSource(
+            layer_settings(), &layer_client_, recording_source.Pass());
+    layer_ = layer.get();
+
     layer->SetBounds(gfx::Size(10, 10));
     layer->SetIsDrawable(true);
     layer_tree_host()->root_layer()->AddChild(layer);
   }
 
   void BeginTest() override {
-    Layer* root = layer_tree_host()->root_layer();
-    PictureLayer* layer = static_cast<PictureLayer*>(root->child_at(0));
-    RecordingSource* recording_source = layer->GetRecordingSourceForTesting();
-
-    // Verify default values.
-    EXPECT_TRUE(root->IsSuitableForGpuRasterization());
-    EXPECT_TRUE(layer->IsSuitableForGpuRasterization());
-    EXPECT_TRUE(recording_source->IsSuitableForGpuRasterization());
+    // Verify default value.
     EXPECT_FALSE(layer_tree_host()->has_gpu_rasterization_trigger());
 
     // With gpu rasterization forced, gpu rasterization trigger is irrelevant.
     layer_tree_host()->SetHasGpuRasterizationTrigger(true);
     EXPECT_TRUE(layer_tree_host()->has_gpu_rasterization_trigger());
 
     // Content-based veto is irrelevant as well.
-    recording_source->SetUnsuitableForGpuRasterizationForTesting();
-    EXPECT_FALSE(recording_source->IsSuitableForGpuRasterization());
-    EXPECT_FALSE(layer->IsSuitableForGpuRasterization());
+    recording_source_->SetUnsuitableForGpuRasterization();
+
     // Veto will take effect when layers are updated.
     // The results will be verified after commit is completed below.
-    // Since we are manually marking picture pile as unsuitable,
+    // Since we are manually marking the source as unsuitable,
     // make sure that the layer gets a chance to update.
-    layer->SetNeedsDisplay();
+    layer_->SetNeedsDisplay();
     PostSetNeedsCommitToMainThread();
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
+    // Ensure the suitability bit sticks.
+    EXPECT_FALSE(recording_source_->IsSuitableForGpuRasterization());

[hendrikw, 2015/09/21 18:36:46]

and here

+    EXPECT_FALSE(layer_->IsSuitableForGpuRasterization());
+
     EXPECT_TRUE(host_impl->sync_tree()->use_gpu_rasterization());
     EXPECT_TRUE(host_impl->use_gpu_rasterization());
   }
 
   void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) override {
+    EXPECT_FALSE(recording_source_->IsSuitableForGpuRasterization());

[hendrikw, 2015/09/21 18:36:46]

and here

+    EXPECT_FALSE(layer_->IsSuitableForGpuRasterization());
+
     EXPECT_TRUE(host_impl->active_tree()->use_gpu_rasterization());
     EXPECT_TRUE(host_impl->use_gpu_rasterization());
     EndTest();
   }
 
   void AfterTest() override {}
 
   FakeContentLayerClient layer_client_;
+  FakePictureLayer* layer_;
+  FakeDisplayListRecordingSource* recording_source_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterizationForced);
 
 class LayerTreeHostTestWillBeginImplFrameHasDidFinishImplFrame
     : public LayerTreeHostTest {
  public:
   enum { kExpectedNumImplFrames = 10 };
 
   LayerTreeHostTestWillBeginImplFrameHasDidFinishImplFrame()
@@ skipping 1631 matching lines @@
   ScrollAndScaleSet scale_info_;
   ScrollAndScaleSet no_op_info_;
   bool requested_update_layers_;
   int commit_count_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostScrollingAndScalingUpdatesLayers);
 
 }  // namespace
 }  // namespace cc