cc: Use ui/gfx geometry types for the CCRenderPass and CCDrawQuad classes.

We use these geometry types for CCDrawQuad types and in CCRenderPass, and so
we also make use of them in the CCRenderer classes.

A minor number of copies back to cc:: (WebCore) geometry types do occur in
the renderer implementations for now until we migrate the rest of the compositor.

Covered by existing tests.

BUG=152473
R=enne,jamesr

Review URL: https://chromiumcodereview.appspot.com/10984053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163142 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc
index b6d1ab6..5bddbe7 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();
             }