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

cc/CCDelegatedRendererLayerImpl.cpp

 // 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 "config.h"
 
 #include "CCDelegatedRendererLayerImpl.h"
 
 #include "CCAppendQuadsData.h"
 #include "CCQuadSink.h"
@@ skipping 25 matching lines @@
 bool CCDelegatedRendererLayerImpl::hasContributingDelegatedRenderPasses() const
 {
     // The root RenderPass for the layer is merged with its target
     // RenderPass in each frame. So we only have extra RenderPasses
     // to merge when we have a non-root RenderPass present.
     return m_renderPassesInDrawOrder.size() > 1;
 }
 
 void CCDelegatedRendererLayerImpl::setRenderPasses(OwnPtrVector<CCRenderPass>& renderPassesInDrawOrder)
 {
-    FloatRect oldRootDamage;
+    ccmath::FloatRect oldRootDamage;
     if (!m_renderPassesInDrawOrder.isEmpty())
         oldRootDamage = m_renderPassesInDrawOrder.last()->damageRect();
 
     clearRenderPasses();
 
     for (size_t i = 0; i < renderPassesInDrawOrder.size(); ++i) {
         m_renderPassesIndexById.set(renderPassesInDrawOrder[i]->id(), i);
         m_renderPassesInDrawOrder.append(renderPassesInDrawOrder.take(i));
     }
     renderPassesInDrawOrder.clear();
 
     if (!m_renderPassesInDrawOrder.isEmpty()) {
-        FloatRect newRootDamage = m_renderPassesInDrawOrder.last()->damageRect();
-        m_renderPassesInDrawOrder.last()->setDamageRect(unionRect(oldRootDamage, newRootDamage));
+        ccmath::FloatRect newRootDamage = m_renderPassesInDrawOrder.last()->damageRect();
+        m_renderPassesInDrawOrder.last()->setDamageRect(ccmath::FloatRect::Union(oldRootDamage, newRootDamage));
     }
 }
 
 void CCDelegatedRendererLayerImpl::clearRenderPasses()
 {
     // FIXME: Release the resources back to the nested compositor.
     m_renderPassesIndexById.clear();
     m_renderPassesInDrawOrder.clear();
 }
 
@@ skipping 102 matching lines @@
         quadSink.append(copyQuad.release(), appendQuadsData);
     }
 }
 
 const char* CCDelegatedRendererLayerImpl::layerTypeAsString() const
 {
     return "DelegatedRendererLayer";
 }
 
 }