| Index: cc/frame_buffer_skpicture_canvas_layer_texture_updater.h
|
| diff --git a/cc/frame_buffer_skpicture_canvas_layer_texture_updater.h b/cc/frame_buffer_skpicture_canvas_layer_texture_updater.h
|
| index 25981a53cdbc2aae22df45551939d1ec45ba5e3c..d024587eb9b876e5634e1d7f3c5f8ceeb3788121 100644
|
| --- a/cc/frame_buffer_skpicture_canvas_layer_texture_updater.h
|
| +++ b/cc/frame_buffer_skpicture_canvas_layer_texture_updater.h
|
| @@ -17,10 +17,10 @@ class FrameBufferSkPictureCanvasLayerTextureUpdater : public SkPictureCanvasLaye
|
| public:
|
| class Texture : public LayerTextureUpdater::Texture {
|
| public:
|
| - Texture(FrameBufferSkPictureCanvasLayerTextureUpdater*, scoped_ptr<CCPrioritizedTexture>);
|
| + Texture(FrameBufferSkPictureCanvasLayerTextureUpdater*, scoped_ptr<PrioritizedTexture>);
|
| virtual ~Texture();
|
|
|
| - virtual void update(CCTextureUpdateQueue&, const IntRect& sourceRect, const IntSize& destOffset, bool partialUpdate, CCRenderingStats&) OVERRIDE;
|
| + virtual void update(TextureUpdateQueue&, const IntRect& sourceRect, const IntSize& destOffset, bool partialUpdate, RenderingStats&) OVERRIDE;
|
|
|
| private:
|
| FrameBufferSkPictureCanvasLayerTextureUpdater* textureUpdater() { return m_textureUpdater; }
|
| @@ -28,13 +28,13 @@ public:
|
| FrameBufferSkPictureCanvasLayerTextureUpdater* m_textureUpdater;
|
| };
|
|
|
| - static scoped_refptr<FrameBufferSkPictureCanvasLayerTextureUpdater> create(scoped_ptr<LayerPainterChromium>);
|
| + static scoped_refptr<FrameBufferSkPictureCanvasLayerTextureUpdater> create(scoped_ptr<LayerPainter>);
|
|
|
| - virtual scoped_ptr<LayerTextureUpdater::Texture> createTexture(CCPrioritizedTextureManager*) OVERRIDE;
|
| + virtual scoped_ptr<LayerTextureUpdater::Texture> createTexture(PrioritizedTextureManager*) OVERRIDE;
|
| virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) OVERRIDE;
|
|
|
| private:
|
| - explicit FrameBufferSkPictureCanvasLayerTextureUpdater(scoped_ptr<LayerPainterChromium>);
|
| + explicit FrameBufferSkPictureCanvasLayerTextureUpdater(scoped_ptr<LayerPainter>);
|
| virtual ~FrameBufferSkPictureCanvasLayerTextureUpdater();
|
| };
|
| } // namespace cc
|
|
|