| Index: cc/tiled_layer.h
|
| diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h
|
| index 616339129e9bbcf7c5d2fc24286bd85fd43e8b69..e3d5fcdcfc60068f92d3d60419d895165fa80df7 100644
|
| --- a/cc/tiled_layer.h
|
| +++ b/cc/tiled_layer.h
|
| @@ -12,13 +12,13 @@
|
| namespace cc {
|
| class UpdatableTile;
|
|
|
| -class TiledLayerChromium : public LayerChromium {
|
| +class TiledLayer : public Layer {
|
| public:
|
| enum TilingOption { AlwaysTile, NeverTile, AutoTile };
|
|
|
| virtual void setIsMask(bool) OVERRIDE;
|
|
|
| - virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
|
| + virtual void pushPropertiesTo(LayerImpl*) OVERRIDE;
|
|
|
| virtual bool drawsContent() const OVERRIDE;
|
| virtual bool needsContentsScale() const OVERRIDE;
|
| @@ -29,17 +29,17 @@ public:
|
|
|
| virtual void setUseLCDText(bool) OVERRIDE;
|
|
|
| - virtual void setLayerTreeHost(CCLayerTreeHost*) OVERRIDE;
|
| + virtual void setLayerTreeHost(LayerTreeHost*) OVERRIDE;
|
|
|
| - virtual void setTexturePriorities(const CCPriorityCalculator&) OVERRIDE;
|
| + virtual void setTexturePriorities(const PriorityCalculator&) OVERRIDE;
|
|
|
| virtual Region visibleContentOpaqueRegion() const OVERRIDE;
|
|
|
| - virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE;
|
| + virtual void update(TextureUpdateQueue&, const OcclusionTracker*, RenderingStats&) OVERRIDE;
|
|
|
| protected:
|
| - TiledLayerChromium();
|
| - virtual ~TiledLayerChromium();
|
| + TiledLayer();
|
| + virtual ~TiledLayer();
|
|
|
| void updateTileSizeAndTilingOption();
|
| void updateBounds();
|
| @@ -47,7 +47,7 @@ protected:
|
| // Exposed to subclasses for testing.
|
| void setTileSize(const IntSize&);
|
| void setTextureFormat(GC3Denum textureFormat) { m_textureFormat = textureFormat; }
|
| - void setBorderTexelOption(CCLayerTilingData::BorderTexelOption);
|
| + void setBorderTexelOption(LayerTilingData::BorderTexelOption);
|
| void setSampledTexelFormat(LayerTextureUpdater::SampledTexelFormat sampledTexelFormat) { m_sampledTexelFormat = sampledTexelFormat; }
|
| size_t numPaintedTiles() { return m_tiler->tiles().size(); }
|
|
|
| @@ -67,10 +67,10 @@ protected:
|
| bool skipsDraw() const { return m_skipsDraw; }
|
|
|
| // Virtual for testing
|
| - virtual CCPrioritizedTextureManager* textureManager() const;
|
| + virtual PrioritizedTextureManager* textureManager() const;
|
|
|
| private:
|
| - virtual scoped_ptr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
|
| + virtual scoped_ptr<LayerImpl> createLayerImpl() OVERRIDE;
|
|
|
| void createTilerIfNeeded();
|
| void setTilingOption(TilingOption);
|
| @@ -78,12 +78,12 @@ private:
|
| bool tileOnlyNeedsPartialUpdate(UpdatableTile*);
|
| bool tileNeedsBufferedUpdate(UpdatableTile*);
|
|
|
| - void markOcclusionsAndRequestTextures(int left, int top, int right, int bottom, const CCOcclusionTracker*);
|
| + void markOcclusionsAndRequestTextures(int left, int top, int right, int bottom, const OcclusionTracker*);
|
|
|
| - bool updateTiles(int left, int top, int right, int bottom, CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&, bool& didPaint);
|
| + 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, CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&);
|
| + void updateTileTextures(const IntRect& paintRect, int left, int top, int right, int bottom, TextureUpdateQueue&, const OcclusionTracker*, RenderingStats&);
|
|
|
| UpdatableTile* tileAt(int, int) const;
|
| UpdatableTile* createTile(int, int);
|
| @@ -94,7 +94,7 @@ private:
|
| LayerTextureUpdater::SampledTexelFormat m_sampledTexelFormat;
|
|
|
| TilingOption m_tilingOption;
|
| - scoped_ptr<CCLayerTilingData> m_tiler;
|
| + scoped_ptr<LayerTilingData> m_tiler;
|
| };
|
|
|
| }
|
|
|