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

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 2654993004: Move GPU blacklist calculation to GPU proc (Closed)
Patch Set: fix win clang build Created 3 years, 10 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
Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 6706ba89fbf7c5ee41a5aba996458e369ad115b2..da1471423e2a8aea9c5758b681bf8031be89a95c 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -467,7 +467,6 @@ class LayerTreeHostContextCacheTest : public LayerTreeHostTest {
}
void InitializeSettings(LayerTreeSettings* settings) override {
- settings->gpu_rasterization_enabled = true;
settings->gpu_rasterization_forced = true;
}
@@ -1659,7 +1658,6 @@ class LayerTreeHostTestGpuRasterDeviceSizeChanged : public LayerTreeHostTest {
}
void InitializeSettings(LayerTreeSettings* settings) override {
- settings->gpu_rasterization_enabled = true;
settings->gpu_rasterization_forced = true;
}
@@ -5164,7 +5162,6 @@ class LayerTreeHostTestHighResRequiredAfterEvictingUIResources
class LayerTreeHostTestGpuRasterizationDefault : public LayerTreeHostTest {
protected:
void InitializeSettings(LayerTreeSettings* settings) override {
- EXPECT_FALSE(settings->gpu_rasterization_enabled);
EXPECT_FALSE(settings->gpu_rasterization_forced);
}
@@ -5271,13 +5268,22 @@ class LayerTreeHostTestEmptyLayerGpuRasterization : public LayerTreeHostTest {
MULTI_THREAD_TEST_F(LayerTreeHostTestEmptyLayerGpuRasterization);
-class LayerTreeHostTestGpuRasterizationEnabled : public LayerTreeHostTest {
+class LayerTreeHostWithGpuRasterizationTest : public LayerTreeHostTest {
protected:
- void InitializeSettings(LayerTreeSettings* settings) override {
- EXPECT_FALSE(settings->gpu_rasterization_enabled);
- settings->gpu_rasterization_enabled = true;
+ std::unique_ptr<TestCompositorFrameSink> CreateCompositorFrameSink(
+ scoped_refptr<ContextProvider> compositor_context_provider,
+ scoped_refptr<ContextProvider> worker_context_provider) override {
+ auto context = TestWebGraphicsContext3D::Create();
+ context->set_gpu_rasterization(true);
+ auto context_provider = TestContextProvider::Create(std::move(context));
+ return LayerTreeHostTest::CreateCompositorFrameSink(
+ std::move(context_provider), std::move(worker_context_provider));
}
+};
+class LayerTreeHostTestGpuRasterizationEnabled
+ : public LayerTreeHostWithGpuRasterizationTest {
+ protected:
void SetupTree() override {
LayerTreeHostTest::SetupTree();
@@ -5339,13 +5345,9 @@ class LayerTreeHostTestGpuRasterizationEnabled : public LayerTreeHostTest {
MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterizationEnabled);
-class LayerTreeHostTestGpuRasterizationReenabled : public LayerTreeHostTest {
+class LayerTreeHostTestGpuRasterizationReenabled
+ : public LayerTreeHostWithGpuRasterizationTest {
protected:
- void InitializeSettings(LayerTreeSettings* settings) override {
- EXPECT_FALSE(settings->gpu_rasterization_enabled);
- settings->gpu_rasterization_enabled = true;
- }
-
void SetupTree() override {
LayerTreeHostTest::SetupTree();
@@ -6151,7 +6153,6 @@ class GpuRasterizationRasterizesBorderTiles : public LayerTreeHostTest {
GpuRasterizationRasterizesBorderTiles() : viewport_size_(1024, 2048) {}
void InitializeSettings(LayerTreeSettings* settings) override {
- settings->gpu_rasterization_enabled = true;
settings->gpu_rasterization_forced = true;
}
@@ -6979,7 +6980,6 @@ class GpuRasterizationSucceedsWithLargeImage : public LayerTreeHostTest {
: viewport_size_(1024, 2048), large_image_size_(20000, 10) {}
void InitializeSettings(LayerTreeSettings* settings) override {
- settings->gpu_rasterization_enabled = true;
settings->gpu_rasterization_forced = true;
/// Set to 0 to force at-raster GPU image decode.
« no previous file with comments | « cc/trees/layer_tree_host_pixeltest_tiles.cc ('k') | cc/trees/layer_tree_host_unittest_record_gpu_histogram.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698