| Index: cc/render_surface.h
|
| diff --git a/cc/render_surface.h b/cc/render_surface.h
|
| index cd3ea6f08c07e35d6f2d744d3066a2ea9e73aaec..a78b53fb69a5035c2c0b2d1f5b7efaeb2b861047 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);
|
| };
|
|
|
| }
|
|
|