diff options
| author | thildebr@chromium.org <thildebr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 06:49:28 +0000 |
|---|---|---|
| committer | thildebr@chromium.org <thildebr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 06:49:28 +0000 |
| commit | a9d4d4f8ff5b837ff736c6019aae93386582e4d3 (patch) | |
| tree | 3c2268be6b030bba8385dba19435ac002ed7ae92 /cc/output | |
| parent | 696bfd03c9ca0be794b3189cea1f6bd7ed16d5ba (diff) | |
| download | chromium_src-a9d4d4f8ff5b837ff736c6019aae93386582e4d3.zip chromium_src-a9d4d4f8ff5b837ff736c6019aae93386582e4d3.tar.gz chromium_src-a9d4d4f8ff5b837ff736c6019aae93386582e4d3.tar.bz2 | |
Rendering context information added to SharedQuadState
Context IDs given to DrawQuads to identify when a rendering context
changes, and whether or not a DrawQuad is in a 3D sorting context.
Review URL: https://codereview.chromium.org/332873005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output')
| -rw-r--r-- | cc/output/renderer_pixeltest.cc | 8 | ||||
| -rw-r--r-- | cc/output/software_renderer_unittest.cc | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc index 57f2a54..2377043 100644 --- a/cc/output/renderer_pixeltest.cc +++ b/cc/output/renderer_pixeltest.cc @@ -58,6 +58,7 @@ SharedQuadState* CreateTestSharedQuadState( const bool is_clipped = false; const float opacity = 1.0f; const SkXfermode::Mode blend_mode = SkXfermode::kSrcOver_Mode; + int sorting_context_id = 0; SharedQuadState* shared_state = render_pass->CreateAndAppendSharedQuadState(); shared_state->SetAll(content_to_target_transform, content_bounds, @@ -65,7 +66,8 @@ SharedQuadState* CreateTestSharedQuadState( clip_rect, is_clipped, opacity, - blend_mode); + blend_mode, + sorting_context_id); return shared_state; } @@ -79,6 +81,7 @@ SharedQuadState* CreateTestSharedQuadStateClipped( const bool is_clipped = true; const float opacity = 1.0f; const SkXfermode::Mode blend_mode = SkXfermode::kSrcOver_Mode; + int sorting_context_id = 0; SharedQuadState* shared_state = render_pass->CreateAndAppendSharedQuadState(); shared_state->SetAll(content_to_target_transform, content_bounds, @@ -86,7 +89,8 @@ SharedQuadState* CreateTestSharedQuadStateClipped( clip_rect, is_clipped, opacity, - blend_mode); + blend_mode, + sorting_context_id); return shared_state; } diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc index ee5af29..52ff828 100644 --- a/cc/output/software_renderer_unittest.cc +++ b/cc/output/software_renderer_unittest.cc @@ -112,7 +112,8 @@ TEST_F(SoftwareRendererTest, SolidColorQuad) { outer_rect, false, 1.0, - SkXfermode::kSrcOver_Mode); + SkXfermode::kSrcOver_Mode, + 0); scoped_ptr<SolidColorDrawQuad> outer_quad = SolidColorDrawQuad::Create(); outer_quad->SetNew( shared_quad_state, outer_rect, outer_rect, SK_ColorYELLOW, false); @@ -198,7 +199,8 @@ TEST_F(SoftwareRendererTest, TileQuad) { outer_rect, false, 1.0, - SkXfermode::kSrcOver_Mode); + SkXfermode::kSrcOver_Mode, + 0); scoped_ptr<TileDrawQuad> outer_quad = TileDrawQuad::Create(); outer_quad->SetNew(shared_quad_state, outer_rect, @@ -281,7 +283,8 @@ TEST_F(SoftwareRendererTest, TileQuadVisibleRect) { tile_rect, false, 1.0, - SkXfermode::kSrcOver_Mode); + SkXfermode::kSrcOver_Mode, + 0); scoped_ptr<TileDrawQuad> quad = TileDrawQuad::Create(); quad->SetNew(shared_quad_state, tile_rect, |