cc: split UpdateGpuRasterizationStatus() into two parts.

cc/trees/layer_tree_host_impl_unittest.cc

Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index cc239da773142f736fc473b1ea41ef43fec1eb96..4f0394d323e8d8297476fdd11808bab726478cf1 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -5933,9 +5933,8 @@ TEST_F(LayerTreeHostImplTest, MemoryPolicy) {
   settings.gpu_rasterization_enabled = true;
   host_impl_ = LayerTreeHostImpl::Create(
       settings, this, &proxy_, &stats_instrumentation_, NULL, NULL, NULL, 0);
-  host_impl_->set_content_is_suitable_for_gpu_rasterization(true);
-  host_impl_->set_has_gpu_rasterization_trigger(true);
-  host_impl_->UpdateGpuRasterizationStatus();
+  host_impl_->SetContentIsSuitableForGpuRasterization(true);
+  host_impl_->SetHasGpuRasterizationTrigger(true);
   host_impl_->SetVisible(true);
   host_impl_->SetMemoryPolicy(policy1);
   EXPECT_EQ(policy1.bytes_limit_when_visible, current_limit_bytes_);
@@ -5977,22 +5976,22 @@ TEST_F(LayerTreeHostImplTest, RequireHighResAfterGpuRasterizationToggles) {
 
   host_impl_->ResetRequiresHighResToDraw();
 
-  host_impl_->set_content_is_suitable_for_gpu_rasterization(true);
-  host_impl_->set_has_gpu_rasterization_trigger(false);
-  host_impl_->UpdateGpuRasterizationStatus();
+  host_impl_->SetContentIsSuitableForGpuRasterization(true);
+  host_impl_->SetHasGpuRasterizationTrigger(false);
+  host_impl_->UpdateTreeResourcesForGpuRasterizationIfNeeded();
   EXPECT_FALSE(host_impl_->RequiresHighResToDraw());
-  host_impl_->set_has_gpu_rasterization_trigger(true);
-  host_impl_->UpdateGpuRasterizationStatus();
+  host_impl_->SetHasGpuRasterizationTrigger(true);
+  host_impl_->UpdateTreeResourcesForGpuRasterizationIfNeeded();
   EXPECT_TRUE(host_impl_->RequiresHighResToDraw());
-  host_impl_->set_has_gpu_rasterization_trigger(false);
-  host_impl_->UpdateGpuRasterizationStatus();
+  host_impl_->SetHasGpuRasterizationTrigger(false);
+  host_impl_->UpdateTreeResourcesForGpuRasterizationIfNeeded();
   EXPECT_TRUE(host_impl_->RequiresHighResToDraw());
 
   host_impl_->ResetRequiresHighResToDraw();
 
   EXPECT_FALSE(host_impl_->RequiresHighResToDraw());
-  host_impl_->set_has_gpu_rasterization_trigger(true);
-  host_impl_->UpdateGpuRasterizationStatus();
+  host_impl_->SetHasGpuRasterizationTrigger(true);
+  host_impl_->UpdateTreeResourcesForGpuRasterizationIfNeeded();
   EXPECT_TRUE(host_impl_->RequiresHighResToDraw());
 }
 
@@ -7727,22 +7726,19 @@ TEST_F(LayerTreeHostImplTest, AddVideoFrameControllerOutsideFrame) {
 TEST_F(LayerTreeHostImplTest, GpuRasterizationStatusModes) {
   EXPECT_FALSE(host_impl_->use_gpu_rasterization());
 
-  host_impl_->set_has_gpu_rasterization_trigger(true);
-  host_impl_->set_content_is_suitable_for_gpu_rasterization(true);
-  host_impl_->UpdateGpuRasterizationStatus();
+  host_impl_->SetHasGpuRasterizationTrigger(true);
+  host_impl_->SetContentIsSuitableForGpuRasterization(true);
   EXPECT_EQ(GpuRasterizationStatus::ON, host_impl_->gpu_rasterization_status());
   EXPECT_TRUE(host_impl_->use_gpu_rasterization());
 
-  host_impl_->set_has_gpu_rasterization_trigger(false);
-  host_impl_->set_content_is_suitable_for_gpu_rasterization(true);
-  host_impl_->UpdateGpuRasterizationStatus();
+  host_impl_->SetHasGpuRasterizationTrigger(false);
+  host_impl_->SetContentIsSuitableForGpuRasterization(true);
   EXPECT_EQ(GpuRasterizationStatus::OFF_VIEWPORT,
             host_impl_->gpu_rasterization_status());
   EXPECT_FALSE(host_impl_->use_gpu_rasterization());
 
-  host_impl_->set_has_gpu_rasterization_trigger(true);
-  host_impl_->set_content_is_suitable_for_gpu_rasterization(false);
-  host_impl_->UpdateGpuRasterizationStatus();
+  host_impl_->SetHasGpuRasterizationTrigger(true);
+  host_impl_->SetContentIsSuitableForGpuRasterization(false);
   EXPECT_EQ(GpuRasterizationStatus::OFF_CONTENT,
             host_impl_->gpu_rasterization_status());
   EXPECT_FALSE(host_impl_->use_gpu_rasterization());
@@ -7756,9 +7752,8 @@ TEST_F(LayerTreeHostImplTest, GpuRasterizationStatusModes) {
   msaaSettings.gpu_rasterization_msaa_sample_count = 4;
   EXPECT_TRUE(CreateHostImpl(
       msaaSettings, FakeOutputSurface::Create3d(context_with_msaa.Pass())));
-  host_impl_->set_has_gpu_rasterization_trigger(true);
-  host_impl_->set_content_is_suitable_for_gpu_rasterization(false);
-  host_impl_->UpdateGpuRasterizationStatus();
+  host_impl_->SetHasGpuRasterizationTrigger(true);
+  host_impl_->SetContentIsSuitableForGpuRasterization(false);
   EXPECT_EQ(GpuRasterizationStatus::MSAA_CONTENT,
             host_impl_->gpu_rasterization_status());
   EXPECT_TRUE(host_impl_->use_gpu_rasterization());
@@ -7767,9 +7762,8 @@ TEST_F(LayerTreeHostImplTest, GpuRasterizationStatusModes) {
   LayerTreeSettings settings = DefaultSettings();
   settings.gpu_rasterization_enabled = false;
   EXPECT_TRUE(CreateHostImpl(settings, FakeOutputSurface::Create3d()));
-  host_impl_->set_has_gpu_rasterization_trigger(true);
-  host_impl_->set_content_is_suitable_for_gpu_rasterization(true);
-  host_impl_->UpdateGpuRasterizationStatus();
+  host_impl_->SetHasGpuRasterizationTrigger(true);
+  host_impl_->SetContentIsSuitableForGpuRasterization(true);
   EXPECT_EQ(GpuRasterizationStatus::OFF_DEVICE,
             host_impl_->gpu_rasterization_status());
   EXPECT_FALSE(host_impl_->use_gpu_rasterization());
@@ -7777,9 +7771,8 @@ TEST_F(LayerTreeHostImplTest, GpuRasterizationStatusModes) {
   settings.gpu_rasterization_forced = true;
   EXPECT_TRUE(CreateHostImpl(settings, FakeOutputSurface::Create3d()));
 
-  host_impl_->set_has_gpu_rasterization_trigger(false);
-  host_impl_->set_content_is_suitable_for_gpu_rasterization(false);
-  host_impl_->UpdateGpuRasterizationStatus();
+  host_impl_->SetHasGpuRasterizationTrigger(false);
+  host_impl_->SetContentIsSuitableForGpuRasterization(false);
   EXPECT_EQ(GpuRasterizationStatus::ON_FORCED,
             host_impl_->gpu_rasterization_status());
   EXPECT_TRUE(host_impl_->use_gpu_rasterization());