summaryrefslogtreecommitdiffstats
path: root/cc/tiled_layer.h
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 23:09:55 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 23:09:55 +0000
commit96baf3e81b1df4b0836d70c3cded9795e63fa789 (patch)
tree4332d128a05777ae34641ca2f185b7b548330b8d /cc/tiled_layer.h
parent1597399122fa6d8343dc6d5cdb771f95908c09b1 (diff)
downloadchromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.zip
chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.gz
chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.bz2
cc: Rename cc classes and members to match filenames
Fixed reland of https://chromiumcodereview.appspot.com/11189043/ TBR=jam@chromium.org,jamesr@chromium.org BUG=155413 Review URL: https://codereview.chromium.org/11231054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/tiled_layer.h')
-rw-r--r--cc/tiled_layer.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h
index fcba110..4681889 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(GLenum textureFormat) { m_textureFormat = textureFormat; }
- void setBorderTexelOption(CCLayerTilingData::BorderTexelOption);
+ void setBorderTexelOption(LayerTilingData::BorderTexelOption);
size_t numPaintedTiles() { return m_tiler->tiles().size(); }
virtual LayerTextureUpdater* textureUpdater() const = 0;
@@ -66,10 +66,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);
@@ -77,12 +77,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);
@@ -92,7 +92,7 @@ private:
bool m_failedUpdate;
TilingOption m_tilingOption;
- scoped_ptr<CCLayerTilingData> m_tiler;
+ scoped_ptr<LayerTilingData> m_tiler;
};
}