diff options
author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:09:55 +0000 |
---|---|---|
committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:09:55 +0000 |
commit | 96baf3e81b1df4b0836d70c3cded9795e63fa789 (patch) | |
tree | 4332d128a05777ae34641ca2f185b7b548330b8d /cc/render_surface.h | |
parent | 1597399122fa6d8343dc6d5cdb771f95908c09b1 (diff) | |
download | chromium_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/render_surface.h')
-rw-r--r-- | cc/render_surface.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cc/render_surface.h b/cc/render_surface.h index cd3ea6f..a78b53f 100644 --- a/cc/render_surface.h +++ b/cc/render_surface.h @@ -15,14 +15,14 @@ namespace cc { -class LayerChromium; +class Layer; -class RenderSurfaceChromium { +class RenderSurface { public: - explicit RenderSurfaceChromium(LayerChromium*); - ~RenderSurfaceChromium(); + explicit RenderSurface(Layer*); + ~RenderSurface(); - // Returns the rect that encloses the RenderSurface including any reflection. + // Returns the rect that encloses the RenderSurfaceImpl including any reflection. FloatRect drawableContentRect() const; const IntRect& contentRect() const { return m_contentRect; } @@ -56,20 +56,20 @@ public: const IntRect& clipRect() const { return m_clipRect; } void setClipRect(const IntRect& clipRect) { m_clipRect = clipRect; } - typedef std::vector<scoped_refptr<LayerChromium> > LayerList; + typedef std::vector<scoped_refptr<Layer> > LayerList; LayerList& layerList() { return m_layerList; } // A no-op since DelegatedRendererLayers on the main thread don't have any // RenderPasses so they can't contribute to a surface. - void addContributingDelegatedRenderPassLayer(LayerChromium*) { } + void addContributingDelegatedRenderPassLayer(Layer*) { } void clearLayerLists() { m_layerList.clear(); } - void setNearestAncestorThatMovesPixels(RenderSurfaceChromium* surface) { m_nearestAncestorThatMovesPixels = surface; } - const RenderSurfaceChromium* nearestAncestorThatMovesPixels() const { return m_nearestAncestorThatMovesPixels; } + void setNearestAncestorThatMovesPixels(RenderSurface* surface) { m_nearestAncestorThatMovesPixels = surface; } + const RenderSurface* nearestAncestorThatMovesPixels() const { return m_nearestAncestorThatMovesPixels; } private: - friend struct CCLayerIteratorActions; + friend struct LayerIteratorActions; - LayerChromium* m_owningLayer; + Layer* m_owningLayer; // Uses this surface's space. IntRect m_contentRect; @@ -90,13 +90,13 @@ private: // The nearest ancestor target surface that will contain the contents of this surface, and that is going // to move pixels within the surface (such as with a blur). This can point to itself. - RenderSurfaceChromium* m_nearestAncestorThatMovesPixels; + RenderSurface* m_nearestAncestorThatMovesPixels; - // For CCLayerIteratorActions + // For LayerIteratorActions int m_targetRenderSurfaceLayerIndexHistory; int m_currentLayerIndexHistory; - DISALLOW_COPY_AND_ASSIGN(RenderSurfaceChromium); + DISALLOW_COPY_AND_ASSIGN(RenderSurface); }; } |