diff options
| author | weiliangc@chromium.org <weiliangc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 05:50:36 +0000 |
|---|---|---|
| committer | weiliangc@chromium.org <weiliangc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 05:50:36 +0000 |
| commit | c6707fdbb7ab92a3ded2f6f18542bc77770e9cfc (patch) | |
| tree | f48af1cf16e746234a67d19ab3e26772d7fb3ea7 /cc/layers/io_surface_layer_impl.cc | |
| parent | 8ef1b247b6685d8c87e936c4b0427aa464fad464 (diff) | |
| download | chromium_src-c6707fdbb7ab92a3ded2f6f18542bc77770e9cfc.zip chromium_src-c6707fdbb7ab92a3ded2f6f18542bc77770e9cfc.tar.gz chromium_src-c6707fdbb7ab92a3ded2f6f18542bc77770e9cfc.tar.bz2 | |
Removed QuadSink and MockQuadCuller
Since QuadSink does not provide more functionatility than passing
through to RenderPass and OcclusionTracker, it can be torn down and
removed. Same is for MockQuadCuller.
This CL follows 302603006, 306683002, 309493002.
BUG=344962
TEST=cc_unittests
Review URL: https://codereview.chromium.org/308193003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers/io_surface_layer_impl.cc')
| -rw-r--r-- | cc/layers/io_surface_layer_impl.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/cc/layers/io_surface_layer_impl.cc b/cc/layers/io_surface_layer_impl.cc index 65fb6b2..8f6c46c 100644 --- a/cc/layers/io_surface_layer_impl.cc +++ b/cc/layers/io_surface_layer_impl.cc @@ -5,11 +5,11 @@ #include "cc/layers/io_surface_layer_impl.h" #include "base/strings/stringprintf.h" -#include "cc/layers/quad_sink.h" #include "cc/output/gl_renderer.h" // For the GLC() macro. #include "cc/output/output_surface.h" #include "cc/quads/io_surface_draw_quad.h" #include "cc/trees/layer_tree_impl.h" +#include "cc/trees/occlusion_tracker.h" #include "gpu/GLES2/gl2extchromium.h" #include "gpu/command_buffer/client/gles2_interface.h" #include "third_party/khronos/GLES2/gl2.h" @@ -64,17 +64,20 @@ bool IOSurfaceLayerImpl::WillDraw(DrawMode draw_mode, return LayerImpl::WillDraw(draw_mode, resource_provider); } -void IOSurfaceLayerImpl::AppendQuads(QuadSink* quad_sink, - AppendQuadsData* append_quads_data) { - SharedQuadState* shared_quad_state = quad_sink->CreateSharedQuadState(); +void IOSurfaceLayerImpl::AppendQuads( + RenderPass* render_pass, + const OcclusionTracker<LayerImpl>& occlusion_tracker, + AppendQuadsData* append_quads_data) { + SharedQuadState* shared_quad_state = + render_pass->CreateAndAppendSharedQuadState(); PopulateSharedQuadState(shared_quad_state); AppendDebugBorderQuad( - quad_sink, content_bounds(), shared_quad_state, append_quads_data); + render_pass, content_bounds(), shared_quad_state, append_quads_data); gfx::Rect quad_rect(content_bounds()); gfx::Rect opaque_rect(contents_opaque() ? quad_rect : gfx::Rect()); - gfx::Rect visible_quad_rect = quad_sink->UnoccludedContentRect( + gfx::Rect visible_quad_rect = occlusion_tracker.UnoccludedContentRect( quad_rect, draw_properties().target_space_transform); if (visible_quad_rect.IsEmpty()) return; @@ -87,7 +90,7 @@ void IOSurfaceLayerImpl::AppendQuads(QuadSink* quad_sink, io_surface_size_, io_surface_resource_id_, IOSurfaceDrawQuad::FLIPPED); - quad_sink->Append(quad.PassAs<DrawQuad>()); + render_pass->AppendDrawQuad(quad.PassAs<DrawQuad>()); } void IOSurfaceLayerImpl::ReleaseResources() { |