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

Unified Diff: cc/delegated_renderer_layer_impl.cc

Issue 10984053: cc: Use ui/gfx geometry types for the CCRenderPass and CCDrawQuad classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/debug_border_draw_quad.cc ('k') | cc/delegated_renderer_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/delegated_renderer_layer_impl.cc
diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc
index b6d1ab6c47aa95b2a440125df0419d5e6fc5ae4c..5bddbe7c6446c350d55717f0499b947efcc81f85 100644
--- a/cc/delegated_renderer_layer_impl.cc
+++ b/cc/delegated_renderer_layer_impl.cc
@@ -44,7 +44,7 @@ bool CCDelegatedRendererLayerImpl::hasContributingDelegatedRenderPasses() const
void CCDelegatedRendererLayerImpl::setRenderPasses(ScopedPtrVector<CCRenderPass>& renderPassesInDrawOrder)
{
- FloatRect oldRootDamage;
+ gfx::RectF oldRootDamage;
if (!m_renderPassesInDrawOrder.isEmpty())
oldRootDamage = m_renderPassesInDrawOrder.last()->damageRect();
@@ -57,8 +57,8 @@ void CCDelegatedRendererLayerImpl::setRenderPasses(ScopedPtrVector<CCRenderPass>
renderPassesInDrawOrder.clear();
if (!m_renderPassesInDrawOrder.isEmpty()) {
- FloatRect newRootDamage = m_renderPassesInDrawOrder.last()->damageRect();
- m_renderPassesInDrawOrder.last()->setDamageRect(unionRect(oldRootDamage, newRootDamage));
+ gfx::RectF newRootDamage = m_renderPassesInDrawOrder.last()->damageRect();
+ m_renderPassesInDrawOrder.last()->setDamageRect(oldRootDamage.Union(newRootDamage));
}
}
@@ -154,7 +154,7 @@ void CCDelegatedRendererLayerImpl::appendRenderPassQuads(CCQuadSink& quadSink, C
// This layer must be drawing to a renderTarget other than itself.
DCHECK(renderTarget() != this);
- copiedSharedQuadState->clippedRectInTarget = CCMathUtil::mapClippedRect(drawTransform(), copiedSharedQuadState->clippedRectInTarget);
+ copiedSharedQuadState->clippedRectInTarget = CCMathUtil::mapClippedRect(drawTransform(), cc::IntRect(copiedSharedQuadState->clippedRectInTarget));
copiedSharedQuadState->quadTransform = copiedSharedQuadState->quadTransform * drawTransform();
copiedSharedQuadState->opacity *= drawOpacity();
}
« no previous file with comments | « cc/debug_border_draw_quad.cc ('k') | cc/delegated_renderer_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698