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

cc/CCRenderPass.h

 // Copyright 2011 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.
 
 #ifndef CCRenderPass_h
 #define CCRenderPass_h
 
 #include "CCDrawQuad.h"
 #include "CCOcclusionTracker.h"
 #include "CCSharedQuadState.h"
-#include "FloatRect.h"
 #include "SkColor.h"
+#include "cc/math/float_rect.h"
 #include "cc/own_ptr_vector.h"
 #include <public/WebFilterOperations.h>
 #include <public/WebTransformationMatrix.h>
 #include <wtf/HashMap.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 
 namespace cc {
 
 class CCLayerImpl;
@@ skipping 28 matching lines @@
             : layerId(layerId)
             , index(index)
         {
         }
 
         bool operator==(const Id& other) const { return layerId == other.layerId && index == other.index; }
         bool operator!=(const Id& other) const { return !(*this == other); }
         bool operator<(const Id& other) const { return layerId < other.layerId || (layerId == other.layerId && index < other.index); }
     };
 
-    static PassOwnPtr<CCRenderPass> create(Id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget);
+    static PassOwnPtr<CCRenderPass> create(Id, ccmath::IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget);
 
     // A shallow copy of the render pass, which does not include its quads.
     PassOwnPtr<CCRenderPass> copy(Id newId) const;
 
     void appendQuadsForLayer(CCLayerImpl*, CCOcclusionTrackerImpl*, CCAppendQuadsData&);
     void appendQuadsForRenderSurfaceLayer(CCLayerImpl*, const CCRenderPass* contributingRenderPass, CCOcclusionTrackerImpl*, CCAppendQuadsData&);
     void appendQuadsToFillScreen(CCLayerImpl* rootLayer, SkColor screenBackgroundColor, const CCOcclusionTrackerImpl&);
 
     const CCQuadList& quadList() const { return m_quadList; }
 
     Id id() const { return m_id; }
 
     // FIXME: Modify this transform when merging the RenderPass into a parent compositor.
     // Transforms from quad's original content space to the root target's content space.
     const WebKit::WebTransformationMatrix& transformToRootTarget() const { return m_transformToRootTarget; }
 
     // This denotes the bounds in physical pixels of the output generated by this RenderPass.
-    const IntRect& outputRect() const { return m_outputRect; }
+    const ccmath::IntRect& outputRect() const { return m_outputRect; }
 
-    FloatRect damageRect() const { return m_damageRect; }
-    void setDamageRect(FloatRect rect) { m_damageRect = rect; }
+    ccmath::FloatRect damageRect() const { return m_damageRect; }
+    void setDamageRect(ccmath::FloatRect rect) { m_damageRect = rect; }
 
     const WebKit::WebFilterOperations& filters() const { return m_filters; }
     void setFilters(const WebKit::WebFilterOperations& filters) { m_filters = filters; }
 
     const WebKit::WebFilterOperations& backgroundFilters() const { return m_backgroundFilters; }
     void setBackgroundFilters(const WebKit::WebFilterOperations& filters) { m_backgroundFilters = filters; }
 
     bool hasTransparentBackground() const { return m_hasTransparentBackground; }
     void setHasTransparentBackground(bool transparent) { m_hasTransparentBackground = transparent; }
 
     bool hasOcclusionFromOutsideTargetSurface() const { return m_hasOcclusionFromOutsideTargetSurface; }
     void setHasOcclusionFromOutsideTargetSurface(bool hasOcclusionFromOutsideTargetSurface) { m_hasOcclusionFromOutsideTargetSurface = hasOcclusionFromOutsideTargetSurface; }
 protected:
-    CCRenderPass(Id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget);
+    CCRenderPass(Id, ccmath::IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget);
 
     Id m_id;
     CCQuadList m_quadList;
     CCSharedQuadStateList m_sharedQuadStateList;
     WebKit::WebTransformationMatrix m_transformToRootTarget;
-    IntRect m_outputRect;
-    FloatRect m_damageRect;
+    ccmath::IntRect m_outputRect;
+    ccmath::FloatRect m_damageRect;
     bool m_hasTransparentBackground;
     bool m_hasOcclusionFromOutsideTargetSurface;
     WebKit::WebFilterOperations m_filters;
     WebKit::WebFilterOperations m_backgroundFilters;
 };
 
 } // namespace cc
 
 namespace WTF {
 template<> struct HashTraits<cc::CCRenderPass::Id> : GenericHashTraits<cc::CCRenderPass::Id> {
@@ skipping 12 matching lines @@
     typedef IntHash<cc::CCRenderPass::Id> Hash;
 };
 } // namespace WTF
 
 namespace cc {
 typedef Vector<CCRenderPass*> CCRenderPassList;
 typedef HashMap<CCRenderPass::Id, OwnPtr<CCRenderPass> > CCRenderPassIdHashMap;
 } // namespace cc
 
 #endif