| Index: cc/tiled_layer.h
|
| diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h
|
| index 7994d2c33febb4ba95a744b180c388f6f05da655..b468a8a9c2dbf2e222a9adf7a53e2b4bebfd3d92 100644
|
| --- a/cc/tiled_layer.h
|
| +++ b/cc/tiled_layer.h
|
| @@ -22,7 +22,7 @@ public:
|
|
|
| virtual bool drawsContent() const OVERRIDE;
|
|
|
| - virtual void setNeedsDisplayRect(const FloatRect&) OVERRIDE;
|
| + virtual void setNeedsDisplayRect(const gfx::RectF&) OVERRIDE;
|
|
|
| virtual void setUseLCDText(bool) OVERRIDE;
|
|
|
| @@ -42,7 +42,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(); }
|
| @@ -51,14 +51,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; }
|
|
|
| @@ -78,8 +78,8 @@ private:
|
|
|
| bool updateTiles(int left, int top, int right, int bottom, ResourceUpdateQueue&, 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, ResourceUpdateQueue&, 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, ResourceUpdateQueue&, const OcclusionTracker*, RenderingStats&);
|
| void updateScrollPrediction();
|
|
|
| UpdatableTile* tileAt(int, int) const;
|
| @@ -90,10 +90,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;
|
|
|