Avoid merging non-opaque Surface renderpasses.

If a surface has overlapping quads then its will render incorrectly if its transparency is moved to its quads. Instead force all non-opaque Surfaces to use their own renderpasses.

Review URL: https://codereview.chromium.org/811623003

Cr-Commit-Position: refs/heads/master@{#308526}

1 files changed, 0 insertions, 2 deletions

diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h
index 9cb0578..051b10b 100644
--- a/cc/surfaces/surface_aggregator.h
+++ b/cc/surfaces/surface_aggregator.h
@@ -42,7 +42,6 @@ class CC_SURFACES_EXPORT SurfaceAggregator {
                            SurfaceId surface_id);
 
   void HandleSurfaceQuad(const SurfaceDrawQuad* surface_quad,
-                         float opacity,
                          RenderPass* dest_pass);
   void CopySharedQuadState(const SharedQuadState* source_sqs,
                            const gfx::Transform& content_to_target_transform,
@@ -50,7 +49,6 @@ class CC_SURFACES_EXPORT SurfaceAggregator {
   void CopyQuadsToPass(const QuadList& source_quad_list,
                        const SharedQuadStateList& source_shared_quad_state_list,
                        const gfx::Transform& content_to_target_transform,
-                       float opacity,
                        RenderPass* dest_pass,
                        SurfaceId surface_id);
   void CopyPasses(const DelegatedFrameData* frame_data, Surface* surface);