Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1984)

Unified Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 1134123005: cc: split UpdateGpuRasterizationStatus() into two parts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/trees/layer_tree_host_impl.cc ('K') | « cc/trees/layer_tree_host_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..3cacc2f12e3d69ba225ae559a59342116eda4e1d 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -5935,7 +5935,6 @@ TEST_F(LayerTreeHostImplTest, MemoryPolicy) {
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_->SetVisible(true);
host_impl_->SetMemoryPolicy(policy1);
EXPECT_EQ(policy1.bytes_limit_when_visible, current_limit_bytes_);
@@ -5979,20 +5978,20 @@ TEST_F(LayerTreeHostImplTest, RequireHighResAfterGpuRasterizationToggles) {
host_impl_->set_content_is_suitable_for_gpu_rasterization(true);
host_impl_->set_has_gpu_rasterization_trigger(false);
- host_impl_->UpdateGpuRasterizationStatus();
+ host_impl_->UpdateTreeResourcesIfNeeded();
EXPECT_FALSE(host_impl_->RequiresHighResToDraw());
host_impl_->set_has_gpu_rasterization_trigger(true);
- host_impl_->UpdateGpuRasterizationStatus();
+ host_impl_->UpdateTreeResourcesIfNeeded();
EXPECT_TRUE(host_impl_->RequiresHighResToDraw());
host_impl_->set_has_gpu_rasterization_trigger(false);
- host_impl_->UpdateGpuRasterizationStatus();
+ host_impl_->UpdateTreeResourcesIfNeeded();
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_->UpdateTreeResourcesIfNeeded();
EXPECT_TRUE(host_impl_->RequiresHighResToDraw());
}
@@ -7729,20 +7728,17 @@ TEST_F(LayerTreeHostImplTest, GpuRasterizationStatusModes) {
host_impl_->set_has_gpu_rasterization_trigger(true);
host_impl_->set_content_is_suitable_for_gpu_rasterization(true);
- host_impl_->UpdateGpuRasterizationStatus();
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();
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();
EXPECT_EQ(GpuRasterizationStatus::OFF_CONTENT,
host_impl_->gpu_rasterization_status());
EXPECT_FALSE(host_impl_->use_gpu_rasterization());
@@ -7758,7 +7754,6 @@ TEST_F(LayerTreeHostImplTest, GpuRasterizationStatusModes) {
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();
EXPECT_EQ(GpuRasterizationStatus::MSAA_CONTENT,
host_impl_->gpu_rasterization_status());
EXPECT_TRUE(host_impl_->use_gpu_rasterization());
@@ -7769,7 +7764,6 @@ TEST_F(LayerTreeHostImplTest, GpuRasterizationStatusModes) {
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();
EXPECT_EQ(GpuRasterizationStatus::OFF_DEVICE,
host_impl_->gpu_rasterization_status());
EXPECT_FALSE(host_impl_->use_gpu_rasterization());
@@ -7779,7 +7773,6 @@ TEST_F(LayerTreeHostImplTest, GpuRasterizationStatusModes) {
host_impl_->set_has_gpu_rasterization_trigger(false);
host_impl_->set_content_is_suitable_for_gpu_rasterization(false);
- host_impl_->UpdateGpuRasterizationStatus();
EXPECT_EQ(GpuRasterizationStatus::ON_FORCED,
host_impl_->gpu_rasterization_status());
EXPECT_TRUE(host_impl_->use_gpu_rasterization());
« cc/trees/layer_tree_host_impl.cc ('K') | « cc/trees/layer_tree_host_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698