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

Unified Diff: cc/test/layer_tree_pixel_resource_test.h

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 | « no previous file | cc/test/layer_tree_pixel_resource_test.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.h
diff --git a/cc/test/layer_tree_pixel_resource_test.h b/cc/test/layer_tree_pixel_resource_test.h
index 0573191495c79756152f4166857068556e584c8c..ddf639dc179b3f602b998c93f8dc97e16a6e9c2b 100644
--- a/cc/test/layer_tree_pixel_resource_test.h
+++ b/cc/test/layer_tree_pixel_resource_test.h
@@ -31,7 +31,8 @@ enum PixelResourceTestCase {
class LayerTreeHostPixelResourceTest : public LayerTreePixelTest {
public:
- explicit LayerTreeHostPixelResourceTest(PixelResourceTestCase test_case);
+ explicit LayerTreeHostPixelResourceTest(PixelResourceTestCase test_case,
+ Layer::LayerMaskType mask_type);
LayerTreeHostPixelResourceTest();
void CreateResourceAndRasterBufferProvider(
@@ -53,6 +54,7 @@ class LayerTreeHostPixelResourceTest : public LayerTreePixelTest {
unsigned draw_texture_target_;
RasterBufferProviderType raster_buffer_provider_type_;
ResourceProvider::TextureHint texture_hint_;
+ Layer::LayerMaskType mask_type_;
bool initialized_;
void InitializeFromTestCase(PixelResourceTestCase test_case);
@@ -61,18 +63,22 @@ class LayerTreeHostPixelResourceTest : public LayerTreePixelTest {
PixelResourceTestCase test_case_;
};
-#define INSTANTIATE_PIXEL_RESOURCE_TEST_CASE_P(framework_name) \
- INSTANTIATE_TEST_CASE_P( \
- PixelResourceTest, framework_name, \
- ::testing::Values( \
- SOFTWARE, GL_GPU_RASTER_2D_DRAW, GL_ONE_COPY_2D_STAGING_2D_DRAW, \
- GL_ONE_COPY_RECT_STAGING_2D_DRAW, \
- GL_ONE_COPY_EXTERNAL_STAGING_2D_DRAW, GL_ZERO_COPY_2D_DRAW, \
- GL_ZERO_COPY_RECT_DRAW, GL_ZERO_COPY_EXTERNAL_DRAW))
+#define INSTANTIATE_PIXEL_RESOURCE_TEST_CASE_P(framework_name) \
+ INSTANTIATE_TEST_CASE_P( \
+ PixelResourceTest, framework_name, \
+ ::testing::Combine( \
+ ::testing::Values( \
+ SOFTWARE, GL_GPU_RASTER_2D_DRAW, GL_ONE_COPY_2D_STAGING_2D_DRAW, \
+ GL_ONE_COPY_RECT_STAGING_2D_DRAW, \
+ GL_ONE_COPY_EXTERNAL_STAGING_2D_DRAW, GL_ZERO_COPY_2D_DRAW, \
+ GL_ZERO_COPY_RECT_DRAW, GL_ZERO_COPY_EXTERNAL_DRAW), \
+ ::testing::Values(Layer::LayerMaskType::SINGLE_TEXTURE_MASK, \
+ Layer::LayerMaskType::MULTI_TEXTURE_MASK)))
class ParameterizedPixelResourceTest
: public LayerTreeHostPixelResourceTest,
- public ::testing::WithParamInterface<PixelResourceTestCase> {
+ public ::testing::WithParamInterface<
+ ::testing::tuple<PixelResourceTestCase, Layer::LayerMaskType>> {
public:
ParameterizedPixelResourceTest();
};
« no previous file with comments | « no previous file | cc/test/layer_tree_pixel_resource_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698