cc: Clip delegated quads to the correct clip rect.

cc/delegated_renderer_layer_impl.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/delegated_renderer_layer_impl.h"
 
 #include "cc/append_quads_data.h"
 #include "cc/math_util.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass_draw_quad.h"
@@ skipping 124 matching lines @@
 void DelegatedRendererLayerImpl::appendRenderPassQuads(QuadSink& quadSink, AppendQuadsData& appendQuadsData, const RenderPass* delegatedRenderPass, gfx::Size frameSize) const
 {
     const SharedQuadState* currentSharedQuadState = 0;
     SharedQuadState* copiedSharedQuadState = 0;
     for (size_t i = 0; i < delegatedRenderPass->quad_list.size(); ++i) {
         const DrawQuad* quad = delegatedRenderPass->quad_list[i];
 
         if (quad->shared_quad_state != currentSharedQuadState) {
             currentSharedQuadState = quad->shared_quad_state;
             copiedSharedQuadState = quadSink.useSharedQuadState(currentSharedQuadState->Copy());
-            bool targetIsFromDelegatedRendererLayer = appendQuadsData.renderPassId.layer_id == id();
-            if (!targetIsFromDelegatedRendererLayer) {
-              // Should be the root render pass.
-              DCHECK(delegatedRenderPass == m_renderPassesInDrawOrder.back());
-              // This layer must be drawing to a renderTarget other than itself.
-              DCHECK(renderTarget() != this);
-
+            bool isRootDelegatedRenderPass = delegatedRenderPass == m_renderPassesInDrawOrder.back();
+            if (isRootDelegatedRenderPass) {
               // Don't allow areas inside the bounds that are empty.
               DCHECK(m_displaySize.IsEmpty() || gfx::Rect(m_displaySize).Contains(gfx::Rect(bounds())));
               gfx::Size displaySize = m_displaySize.IsEmpty() ? bounds() : m_displaySize;
 
               gfx::Transform delegatedFrameToLayerSpaceTransform;
               delegatedFrameToLayerSpaceTransform.Scale(
                   static_cast<double>(displaySize.width()) / frameSize.width(),
                   static_cast<double>(displaySize.height()) / frameSize.height());
 
               copiedSharedQuadState->content_to_target_transform = drawTransform() * delegatedFrameToLayerSpaceTransform * copiedSharedQuadState->content_to_target_transform;
-              copiedSharedQuadState->clip_rect = MathUtil::mapClippedRect(drawTransform() * delegatedFrameToLayerSpaceTransform, copiedSharedQuadState->clip_rect);
+
+              if (renderTarget() == this) {
+                  DCHECK(!isClipped());
+                  DCHECK(renderSurface());
+                  copiedSharedQuadState->clip_rect = MathUtil::mapClippedRect(
+                      drawTransform() * delegatedFrameToLayerSpaceTransform,
+                      copiedSharedQuadState->clip_rect);
+              } else {
+                  gfx::Rect clip_rect = drawableContentRect();
+                  if (copiedSharedQuadState->is_clipped) {
+                      clip_rect.Intersect(MathUtil::mapClippedRect(
+                          drawTransform() * delegatedFrameToLayerSpaceTransform,
+                          copiedSharedQuadState->clip_rect));
+                  }
+                  copiedSharedQuadState->clip_rect = clip_rect;
+                  copiedSharedQuadState->is_clipped = true;
+              }
+
               copiedSharedQuadState->opacity *= drawOpacity();
             }
         }
         DCHECK(copiedSharedQuadState);
 
         scoped_ptr<DrawQuad> copyQuad;
         if (quad->material != DrawQuad::RENDER_PASS)
             copyQuad = quad->Copy(copiedSharedQuadState);
         else {
             RenderPass::Id contributingDelegatedRenderPassId = RenderPassDrawQuad::MaterialCast(quad)->render_pass_id;
             RenderPass::Id contributingRenderPassId = convertDelegatedRenderPassId(contributingDelegatedRenderPassId);
             DCHECK(contributingRenderPassId != appendQuadsData.renderPassId);
 
             copyQuad = RenderPassDrawQuad::MaterialCast(quad)->Copy(copiedSharedQuadState, contributingRenderPassId).PassAs<DrawQuad>();
         }
         DCHECK(copyQuad.get());
 
         quadSink.append(copyQuad.Pass(), appendQuadsData);
     }
 }
 
 const char* DelegatedRendererLayerImpl::layerTypeAsString() const
 {
     return "DelegatedRendererLayer";
 }
 
 }  // namespace cc