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

Unified Diff: cc/test/layer_tree_pixel_resource_test.cc

Issue 2852083002: cc: cc pixel tests test both single/multi texture mask code paths. (Closed)
Patch Set: Make layer_tree_pixel_resource_test take in mask type as a parameter. Created 3 years, 8 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
« no previous file with comments | « cc/test/layer_tree_pixel_resource_test.h ('k') | cc/trees/layer_tree_host_pixeltest_masks.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_pixel_resource_test.cc
diff --git a/cc/test/layer_tree_pixel_resource_test.cc b/cc/test/layer_tree_pixel_resource_test.cc
index debefe1f76e4c09723e435a1957c3b77cba9dcb9..d33d2ea8cbc3d4ffa3a2c6638a7789961d441449 100644
--- a/cc/test/layer_tree_pixel_resource_test.cc
+++ b/cc/test/layer_tree_pixel_resource_test.cc
@@ -42,10 +42,12 @@ bool IsTestCaseSupported(PixelResourceTestCase test_case) {
} // namespace
LayerTreeHostPixelResourceTest::LayerTreeHostPixelResourceTest(
- PixelResourceTestCase test_case)
+ PixelResourceTestCase test_case,
+ Layer::LayerMaskType mask_type)
: draw_texture_target_(GL_INVALID_VALUE),
raster_buffer_provider_type_(RASTER_BUFFER_PROVIDER_TYPE_BITMAP),
texture_hint_(ResourceProvider::TEXTURE_HINT_IMMUTABLE),
+ mask_type_(mask_type),
initialized_(false),
test_case_(test_case) {
InitializeFromTestCase(test_case);
@@ -54,6 +56,7 @@ LayerTreeHostPixelResourceTest::LayerTreeHostPixelResourceTest(
LayerTreeHostPixelResourceTest::LayerTreeHostPixelResourceTest()
: draw_texture_target_(GL_INVALID_VALUE),
raster_buffer_provider_type_(RASTER_BUFFER_PROVIDER_TYPE_BITMAP),
+ mask_type_(Layer::LayerMaskType::SINGLE_TEXTURE_MASK),
initialized_(false),
test_case_(SOFTWARE) {}
@@ -186,7 +189,7 @@ void LayerTreeHostPixelResourceTest::RunPixelResourceTest(
}
ParameterizedPixelResourceTest::ParameterizedPixelResourceTest()
- : LayerTreeHostPixelResourceTest(GetParam()) {
-}
+ : LayerTreeHostPixelResourceTest(::testing::get<0>(GetParam()),
+ ::testing::get<1>(GetParam())) {}
} // namespace cc
« no previous file with comments | « cc/test/layer_tree_pixel_resource_test.h ('k') | cc/trees/layer_tree_host_pixeltest_masks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698