Index: cc/layer_tree_host.h |
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h |
index c80e79d019e081e833e2f999b83c401e33828c81..7475ccba33317ecedcd1636eb2dc9ff2a731630b 100644 |
--- a/cc/layer_tree_host.h |
+++ b/cc/layer_tree_host.h |
@@ -7,7 +7,6 @@ |
#include <limits> |
-#include "IntRect.h" |
#include "base/basictypes.h" |
#include "base/hash_tables.h" |
#include "base/memory/ref_counted.h" |
@@ -23,6 +22,7 @@ |
#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 { |
@@ -38,6 +38,7 @@ struct hash<WebKit::WebGraphicsContext3D*> { |
namespace cc { |
class FontAtlas; |
+class IntRect; |
class Layer; |
class LayerTreeHostImpl; |
class LayerTreeHostImplClient; |
@@ -63,9 +64,9 @@ struct LayerTreeSettings { |
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; } |
@@ -166,10 +167,10 @@ public: |
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); |
@@ -251,8 +252,8 @@ private: |
LayerTreeSettings m_settings; |
- IntSize m_layoutViewportSize; |
- IntSize m_deviceViewportSize; |
+ gfx::Size m_layoutViewportSize; |
+ gfx::Size m_deviceViewportSize; |
float m_deviceScaleFactor; |
bool m_visible; |