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 4435 matching lines @@
     EXPECT_TRUE(root->IsSuitableForGpuRasterization());
     EXPECT_TRUE(layer->IsSuitableForGpuRasterization());
     EXPECT_TRUE(recording_source->IsSuitableForGpuRasterization());
     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();
+    recording_source->SetUnsuitableForGpuRasterization();
     EXPECT_FALSE(recording_source->IsSuitableForGpuRasterization());
     EXPECT_FALSE(layer->IsSuitableForGpuRasterization());
     // 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,
     // make sure that the layer gets a chance to update.
     layer->SetNeedsDisplay();
     PostSetNeedsCommitToMainThread();
   }
 
@@ skipping 18 matching lines @@
 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)));
     scoped_refptr<FakePictureLayer> layer =
-        FakePictureLayer::Create(layer_settings(), &layer_client_);
+        FakePictureLayer::CreateWithRecordingSource(
+            layer_settings(), &layer_client_, recording_source.Pass());
+
     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();
+    FakeDisplayListRecordingSource* recording_source =

[danakj, 2015/09/16 23:04:49]

ditto, store the fake source* on the class and do it before Passing to avoid the
cast?

[pdr., 2015/09/17 20:52:45]

Hmm, this one doesn't seem worth it in terms of complexity.

[danakj, 2015/09/17 21:11:32]

OK. I just don't like casts if we can avoid it.

+        static_cast<FakeDisplayListRecordingSource*>(
+            layer->GetRecordingSourceForTesting());
 
     // Verify default values.
     EXPECT_TRUE(root->IsSuitableForGpuRasterization());
     EXPECT_TRUE(layer->IsSuitableForGpuRasterization());
     EXPECT_TRUE(recording_source->IsSuitableForGpuRasterization());
     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();
+    recording_source->SetUnsuitableForGpuRasterization();
     EXPECT_FALSE(recording_source->IsSuitableForGpuRasterization());
     EXPECT_FALSE(layer->IsSuitableForGpuRasterization());
     // 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,
     // make sure that the layer gets a chance to update.
     layer->SetNeedsDisplay();
     PostSetNeedsCommitToMainThread();
   }
 
@@ skipping 1655 matching lines @@
   ScrollAndScaleSet scale_info_;
   ScrollAndScaleSet no_op_info_;
   bool requested_update_layers_;
   int commit_count_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostScrollingAndScalingUpdatesLayers);
 
 }  // namespace
 }  // namespace cc