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

Side by Side Diff: cc/delegated_renderer_layer_impl.cc

Issue 11275113: Remove most remaining references to IntRect and FloatRect. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compositor bindings Created 8 years, 1 month 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 | « cc/debug_rect_history.cc ('k') | cc/direct_renderer.h » ('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 "config.h" 5 #include "config.h"
6 6
7 #include "cc/delegated_renderer_layer_impl.h" 7 #include "cc/delegated_renderer_layer_impl.h"
8 8
9 #include "cc/append_quads_data.h" 9 #include "cc/append_quads_data.h"
10 #include "cc/math_util.h" 10 #include "cc/math_util.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 if (quad->sharedQuadState() != currentSharedQuadState) { 147 if (quad->sharedQuadState() != currentSharedQuadState) {
148 currentSharedQuadState = quad->sharedQuadState(); 148 currentSharedQuadState = quad->sharedQuadState();
149 copiedSharedQuadState = quadSink.useSharedQuadState(currentSharedQua dState->copy()); 149 copiedSharedQuadState = quadSink.useSharedQuadState(currentSharedQua dState->copy());
150 bool targetIsFromDelegatedRendererLayer = appendQuadsData.renderPass Id.layerId == id(); 150 bool targetIsFromDelegatedRendererLayer = appendQuadsData.renderPass Id.layerId == id();
151 if (!targetIsFromDelegatedRendererLayer) { 151 if (!targetIsFromDelegatedRendererLayer) {
152 // Should be the root render pass. 152 // Should be the root render pass.
153 DCHECK(delegatedRenderPass == m_renderPassesInDrawOrder.last()); 153 DCHECK(delegatedRenderPass == m_renderPassesInDrawOrder.last());
154 // This layer must be drawing to a renderTarget other than itself. 154 // This layer must be drawing to a renderTarget other than itself.
155 DCHECK(renderTarget() != this); 155 DCHECK(renderTarget() != this);
156 156
157 copiedSharedQuadState->clippedRectInTarget = MathUtil::mapClippedR ect(drawTransform(), cc::IntRect(copiedSharedQuadState->clippedRectInTarget)); 157 copiedSharedQuadState->clippedRectInTarget = MathUtil::mapClippedR ect(drawTransform(), copiedSharedQuadState->clippedRectInTarget);
158 copiedSharedQuadState->quadTransform = copiedSharedQuadState->quad Transform * drawTransform(); 158 copiedSharedQuadState->quadTransform = copiedSharedQuadState->quad Transform * drawTransform();
159 copiedSharedQuadState->opacity *= drawOpacity(); 159 copiedSharedQuadState->opacity *= drawOpacity();
160 } 160 }
161 } 161 }
162 DCHECK(copiedSharedQuadState); 162 DCHECK(copiedSharedQuadState);
163 163
164 scoped_ptr<DrawQuad> copyQuad; 164 scoped_ptr<DrawQuad> copyQuad;
165 if (quad->material() != DrawQuad::RenderPass) 165 if (quad->material() != DrawQuad::RenderPass)
166 copyQuad = quad->copy(copiedSharedQuadState); 166 copyQuad = quad->copy(copiedSharedQuadState);
167 else { 167 else {
168 RenderPass::Id contributingDelegatedRenderPassId = RenderPassDrawQua d::materialCast(quad)->renderPassId(); 168 RenderPass::Id contributingDelegatedRenderPassId = RenderPassDrawQua d::materialCast(quad)->renderPassId();
169 RenderPass::Id contributingRenderPassId = convertDelegatedRenderPass Id(contributingDelegatedRenderPassId); 169 RenderPass::Id contributingRenderPassId = convertDelegatedRenderPass Id(contributingDelegatedRenderPassId);
170 DCHECK(contributingRenderPassId != appendQuadsData.renderPassId); 170 DCHECK(contributingRenderPassId != appendQuadsData.renderPassId);
171 171
172 copyQuad = RenderPassDrawQuad::materialCast(quad)->copy(copiedShared QuadState, contributingRenderPassId).PassAs<DrawQuad>(); 172 copyQuad = RenderPassDrawQuad::materialCast(quad)->copy(copiedShared QuadState, contributingRenderPassId).PassAs<DrawQuad>();
173 } 173 }
174 DCHECK(copyQuad.get()); 174 DCHECK(copyQuad.get());
175 175
176 quadSink.append(copyQuad.Pass(), appendQuadsData); 176 quadSink.append(copyQuad.Pass(), appendQuadsData);
177 } 177 }
178 } 178 }
179 179
180 const char* DelegatedRendererLayerImpl::layerTypeAsString() const 180 const char* DelegatedRendererLayerImpl::layerTypeAsString() const
181 { 181 {
182 return "DelegatedRendererLayer"; 182 return "DelegatedRendererLayer";
183 } 183 }
184 184
185 } 185 }
OLDNEW
« no previous file with comments | « cc/debug_rect_history.cc ('k') | cc/direct_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698