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

Side by Side Diff: cc/delegated_renderer_layer_impl.cc

Issue 11828011: cc: Map the clip_rect in the SharedQuadState to include the host layer's drawTransform (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | cc/delegated_renderer_layer_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/delegated_renderer_layer_impl.h" 5 #include "cc/delegated_renderer_layer_impl.h"
6 6
7 #include "cc/append_quads_data.h" 7 #include "cc/append_quads_data.h"
8 #include "cc/math_util.h" 8 #include "cc/math_util.h"
9 #include "cc/quad_sink.h" 9 #include "cc/quad_sink.h"
10 #include "cc/render_pass_draw_quad.h" 10 #include "cc/render_pass_draw_quad.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 copiedSharedQuadState = quadSink.useSharedQuadState(currentSharedQua dState->Copy()); 140 copiedSharedQuadState = quadSink.useSharedQuadState(currentSharedQua dState->Copy());
141 bool targetIsFromDelegatedRendererLayer = appendQuadsData.renderPass Id.layer_id == id(); 141 bool targetIsFromDelegatedRendererLayer = appendQuadsData.renderPass Id.layer_id == id();
142 if (!targetIsFromDelegatedRendererLayer) { 142 if (!targetIsFromDelegatedRendererLayer) {
143 // Should be the root render pass. 143 // Should be the root render pass.
144 DCHECK(delegatedRenderPass == m_renderPassesInDrawOrder.last()); 144 DCHECK(delegatedRenderPass == m_renderPassesInDrawOrder.last());
145 // This layer must be drawing to a renderTarget other than itself. 145 // This layer must be drawing to a renderTarget other than itself.
146 DCHECK(renderTarget() != this); 146 DCHECK(renderTarget() != this);
147 147
148 copiedSharedQuadState->content_to_target_transform = copiedSharedQ uadState->content_to_target_transform * drawTransform(); 148 copiedSharedQuadState->content_to_target_transform = copiedSharedQ uadState->content_to_target_transform * drawTransform();
149 copiedSharedQuadState->clipped_rect_in_target = MathUtil::mapClipp edRect(drawTransform(), copiedSharedQuadState->clipped_rect_in_target); 149 copiedSharedQuadState->clipped_rect_in_target = MathUtil::mapClipp edRect(drawTransform(), copiedSharedQuadState->clipped_rect_in_target);
150 copiedSharedQuadState->clip_rect = MathUtil::mapClippedRect(drawTr ansform(), copiedSharedQuadState->clip_rect);
150 copiedSharedQuadState->opacity *= drawOpacity(); 151 copiedSharedQuadState->opacity *= drawOpacity();
151 } 152 }
152 } 153 }
153 DCHECK(copiedSharedQuadState); 154 DCHECK(copiedSharedQuadState);
154 155
155 scoped_ptr<DrawQuad> copyQuad; 156 scoped_ptr<DrawQuad> copyQuad;
156 if (quad->material != DrawQuad::RENDER_PASS) 157 if (quad->material != DrawQuad::RENDER_PASS)
157 copyQuad = quad->Copy(copiedSharedQuadState); 158 copyQuad = quad->Copy(copiedSharedQuadState);
158 else { 159 else {
159 RenderPass::Id contributingDelegatedRenderPassId = RenderPassDrawQua d::MaterialCast(quad)->render_pass_id; 160 RenderPass::Id contributingDelegatedRenderPassId = RenderPassDrawQua d::MaterialCast(quad)->render_pass_id;
160 RenderPass::Id contributingRenderPassId = convertDelegatedRenderPass Id(contributingDelegatedRenderPassId); 161 RenderPass::Id contributingRenderPassId = convertDelegatedRenderPass Id(contributingDelegatedRenderPassId);
161 DCHECK(contributingRenderPassId != appendQuadsData.renderPassId); 162 DCHECK(contributingRenderPassId != appendQuadsData.renderPassId);
162 163
163 copyQuad = RenderPassDrawQuad::MaterialCast(quad)->Copy(copiedShared QuadState, contributingRenderPassId).PassAs<DrawQuad>(); 164 copyQuad = RenderPassDrawQuad::MaterialCast(quad)->Copy(copiedShared QuadState, contributingRenderPassId).PassAs<DrawQuad>();
164 } 165 }
165 DCHECK(copyQuad.get()); 166 DCHECK(copyQuad.get());
166 167
167 quadSink.append(copyQuad.Pass(), appendQuadsData); 168 quadSink.append(copyQuad.Pass(), appendQuadsData);
168 } 169 }
169 } 170 }
170 171
171 const char* DelegatedRendererLayerImpl::layerTypeAsString() const 172 const char* DelegatedRendererLayerImpl::layerTypeAsString() const
172 { 173 {
173 return "DelegatedRendererLayer"; 174 return "DelegatedRendererLayer";
174 } 175 }
175 176
176 } // namespace cc 177 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/delegated_renderer_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698