cc: Use gfx:: Geometry types for positions, bounds, and related things.

cc/layer_tree_host.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 CCLayerTreeHost_h
 #define CCLayerTreeHost_h
 
 #include <limits>
 
-#include "IntRect.h"
 #include "base/basictypes.h"
 #include "base/cancelable_callback.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/animation_events.h"
 #include "cc/graphics_context.h"
 #include "cc/layer_tree_host_client.h"
 #include "cc/layer_tree_host_common.h"
 #include "cc/occlusion_tracker.h"
 #include "cc/prioritized_texture_manager.h"
 #include "cc/proxy.h"
 #include "cc/rate_limiter.h"
 #include "cc/rendering_stats.h"
 #include "cc/scoped_ptr_vector.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/rect.h"
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
 template<>
 struct hash<WebKit::WebGraphicsContext3D*> {
   size_t operator()(WebKit::WebGraphicsContext3D* ptr) const {
     return hash<size_t>()(reinterpret_cast<size_t>(ptr));
   }
 };
 } // namespace BASE_HASH_NAMESPACE
 #endif // COMPILER
 
 namespace cc {
 
 class FontAtlas;
+class IntRect;
 class Layer;
 class LayerTreeHostImpl;
 class LayerTreeHostImplClient;
 class PrioritizedTextureManager;
 class ResourceUpdateQueue;
 class HeadsUpDisplayLayer;
 class Region;
 struct ScrollAndScaleSet;
 
 struct LayerTreeSettings {
     LayerTreeSettings();
     ~LayerTreeSettings();
 
     bool acceleratePainting;
     bool showFPSCounter;
     bool showPlatformLayerTree;
     bool showPaintRects;
     bool showPropertyChangedRects;
     bool showSurfaceDamageRects;
     bool showScreenSpaceRects;
     bool showReplicaScreenSpaceRects;
     bool showOccludingRects;
     bool renderVSyncEnabled;
     double refreshRate;
     size_t maxPartialTextureUpdates;
-    IntSize defaultTileSize;
-    IntSize maxUntiledLayerSize;
-    IntSize minimumOcclusionTrackingSize;
+    gfx::Size defaultTileSize;
+    gfx::Size maxUntiledLayerSize;
+    gfx::Size minimumOcclusionTrackingSize;
 
     bool showDebugInfo() const { return showPlatformLayerTree || showFPSCounter || showDebugRects(); }
     bool showDebugRects() const { return showPaintRects || showPropertyChangedRects || showSurfaceDamageRects || showScreenSpaceRects || showReplicaScreenSpaceRects || showOccludingRects; }
 };
 
 // Provides information on an Impl's rendering capabilities back to the LayerTreeHost
 struct RendererCapabilities {
     RendererCapabilities();
     ~RendererCapabilities();
 
@@ skipping 85 matching lines @@
 
     void setAnimationEvents(scoped_ptr<AnimationEventsVector>, base::Time wallClockTime);
     virtual void didAddAnimation();
 
     Layer* rootLayer() { return m_rootLayer.get(); }
     const Layer* rootLayer() const { return m_rootLayer.get(); }
     void setRootLayer(scoped_refptr<Layer>);
 
     const LayerTreeSettings& settings() const { return m_settings; }
 
-    void setViewportSize(const IntSize& layoutViewportSize, const IntSize& deviceViewportSize);
+    void setViewportSize(const gfx::Size& layoutViewportSize, const gfx::Size& deviceViewportSize);
 
-    const IntSize& layoutViewportSize() const { return m_layoutViewportSize; }
-    const IntSize& deviceViewportSize() const { return m_deviceViewportSize; }
+    const gfx::Size& layoutViewportSize() const { return m_layoutViewportSize; }
+    const gfx::Size& deviceViewportSize() const { return m_deviceViewportSize; }
 
     void setPageScaleFactorAndLimits(float pageScaleFactor, float minPageScaleFactor, float maxPageScaleFactor);
 
     void setBackgroundColor(SkColor color) { m_backgroundColor = color; }
 
     void setHasTransparentBackground(bool transparent) { m_hasTransparentBackground = transparent; }
 
     PrioritizedTextureManager* contentsTextureManager() const;
 
     bool visible() const { return m_visible; }
     void setVisible(bool);
 
     void startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, base::TimeDelta duration);
 
     void applyScrollAndScale(const ScrollAndScaleSet&);
-    FloatPoint adjustEventPointForPinchZoom(const FloatPoint&) const;
+    gfx::PointF adjustEventPointForPinchZoom(const gfx::PointF&) const;
     void setImplTransform(const WebKit::WebTransformationMatrix&);
 
     void startRateLimiter(WebKit::WebGraphicsContext3D*);
     void stopRateLimiter(WebKit::WebGraphicsContext3D*);
 
     // RateLimitClient implementation
     virtual void rateLimit() OVERRIDE;
 
     bool bufferedUpdates();
     bool requestPartialTextureUpdate();
@@ skipping 48 matching lines @@
 
     scoped_refptr<Layer> m_rootLayer;
     scoped_refptr<HeadsUpDisplayLayer> m_hudLayer;
     scoped_ptr<FontAtlas> m_fontAtlas;
 
     scoped_ptr<PrioritizedTextureManager> m_contentsTextureManager;
     scoped_ptr<PrioritizedTexture> m_surfaceMemoryPlaceholder;
 
     LayerTreeSettings m_settings;
 
-    IntSize m_layoutViewportSize;
-    IntSize m_deviceViewportSize;
+    gfx::Size m_layoutViewportSize;
+    gfx::Size m_deviceViewportSize;
     float m_deviceScaleFactor;
 
     bool m_visible;
 
     typedef base::hash_map<WebKit::WebGraphicsContext3D*, scoped_refptr<RateLimiter> > RateLimiterMap;
     RateLimiterMap m_rateLimiters;
 
     float m_pageScaleFactor;
     float m_minPageScaleFactor, m_maxPageScaleFactor;
     WebKit::WebTransformationMatrix m_implTransform;
     bool m_triggerIdleUpdates;
 
     SkColor m_backgroundColor;
     bool m_hasTransparentBackground;
 
     typedef ScopedPtrVector<PrioritizedTexture> TextureList;
     size_t m_partialTextureUpdateRequests;
 
     static bool s_needsFilterContext;
 
     DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
 };
 
 }  // namespace cc
 
 #endif