Index: cc/tiled_layer.h |
diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h |
index d3ec8562cf03d0afb63cc1440c146aa450b1a21e..293beef3e331974aae65b4904366cbf0ef463d0b 100644 |
--- a/cc/tiled_layer.h |
+++ b/cc/tiled_layer.h |
@@ -23,9 +23,9 @@ public: |
virtual bool drawsContent() const OVERRIDE; |
virtual bool needsContentsScale() const OVERRIDE; |
- virtual IntSize contentBounds() const OVERRIDE; |
+ virtual gfx::Size contentBounds() const OVERRIDE; |
- virtual void setNeedsDisplayRect(const FloatRect&) OVERRIDE; |
+ virtual void setNeedsDisplayRect(const gfx::RectF&) OVERRIDE; |
virtual void setUseLCDText(bool) OVERRIDE; |
@@ -45,7 +45,7 @@ protected: |
void updateBounds(); |
// Exposed to subclasses for testing. |
- void setTileSize(const IntSize&); |
+ void setTileSize(const gfx::Size&); |
void setTextureFormat(GLenum textureFormat) { m_textureFormat = textureFormat; } |
void setBorderTexelOption(LayerTilingData::BorderTexelOption); |
size_t numPaintedTiles() { return m_tiler->tiles().size(); } |
@@ -54,14 +54,14 @@ protected: |
virtual void createUpdaterIfNeeded() = 0; |
// Set invalidations to be potentially repainted during update(). |
- void invalidateContentRect(const IntRect& contentRect); |
+ void invalidateContentRect(const gfx::Rect& contentRect); |
// Reset state on tiles that will be used for updating the layer. |
void resetUpdateState(); |
// After preparing an update, returns true if more painting is needed. |
bool needsIdlePaint(); |
- IntRect idlePaintRect(); |
+ gfx::Rect idlePaintRect(); |
bool skipsDraw() const { return m_skipsDraw; } |
@@ -81,8 +81,8 @@ private: |
bool updateTiles(int left, int top, int right, int bottom, TextureUpdateQueue&, const OcclusionTracker*, RenderingStats&, bool& didPaint); |
bool haveTexturesForTiles(int left, int top, int right, int bottom, bool ignoreOcclusions); |
- IntRect markTilesForUpdate(int left, int top, int right, int bottom, bool ignoreOcclusions); |
- void updateTileTextures(const IntRect& paintRect, int left, int top, int right, int bottom, TextureUpdateQueue&, const OcclusionTracker*, RenderingStats&); |
+ gfx::Rect markTilesForUpdate(int left, int top, int right, int bottom, bool ignoreOcclusions); |
+ void updateTileTextures(const gfx::Rect& paintRect, int left, int top, int right, int bottom, TextureUpdateQueue&, const OcclusionTracker*, RenderingStats&); |
void updateScrollPrediction(); |
UpdatableTile* tileAt(int, int) const; |
@@ -93,10 +93,10 @@ private: |
bool m_failedUpdate; |
// Used for predictive painting. |
- IntSize m_predictedScroll; |
- IntRect m_predictedVisibleRect; |
- IntRect m_previousVisibleRect; |
- IntSize m_previousContentBounds; |
+ gfx::Vector2d m_predictedScroll; |
+ gfx::Rect m_predictedVisibleRect; |
+ gfx::Rect m_previousVisibleRect; |
+ gfx::Size m_previousContentBounds; |
TilingOption m_tilingOption; |
scoped_ptr<LayerTilingData> m_tiler; |