| Index: cc/skpicture_content_layer_updater.h
|
| diff --git a/cc/skpicture_content_layer_updater.h b/cc/skpicture_content_layer_updater.h
|
| index 6a05972ff8bd10fa7e418b64f5d389ca232049b5..cc2d86c52053516266203f6e6afb878c6599eaaa 100644
|
| --- a/cc/skpicture_content_layer_updater.h
|
| +++ b/cc/skpicture_content_layer_updater.h
|
| @@ -24,7 +24,7 @@ class SkPictureContentLayerUpdater : public ContentLayerUpdater {
|
| public:
|
| class Resource : public LayerUpdater::Resource {
|
| public:
|
| - Resource(SkPictureContentLayerUpdater*, scoped_ptr<PrioritizedTexture>);
|
| + Resource(SkPictureContentLayerUpdater*, scoped_ptr<PrioritizedResource>);
|
| virtual ~Resource();
|
|
|
| virtual void update(ResourceUpdateQueue&, const gfx::Rect& sourceRect, const gfx::Vector2d& destOffset, bool partialUpdate, RenderingStats&) OVERRIDE;
|
| @@ -37,7 +37,7 @@ public:
|
|
|
| static scoped_refptr<SkPictureContentLayerUpdater> create(scoped_ptr<LayerPainter>);
|
|
|
| - virtual scoped_ptr<LayerUpdater::Resource> createResource(PrioritizedTextureManager*) OVERRIDE;
|
| + virtual scoped_ptr<LayerUpdater::Resource> createResource(PrioritizedResourceManager*) OVERRIDE;
|
| virtual void setOpaque(bool) OVERRIDE;
|
|
|
| protected:
|
| @@ -46,7 +46,7 @@ protected:
|
|
|
| virtual void prepareToUpdate(const gfx::Rect& contentRect, const gfx::Size& tileSize, float contentsWidthScale, float contentsHeightScale, gfx::Rect& resultingOpaqueRect, RenderingStats&) OVERRIDE;
|
| void drawPicture(SkCanvas*);
|
| - void updateTexture(ResourceUpdateQueue& queue, PrioritizedTexture* texture, const gfx::Rect& sourceRect, const gfx::Vector2d& destOffset, bool partialUpdate);
|
| + void updateTexture(ResourceUpdateQueue& queue, PrioritizedResource* texture, const gfx::Rect& sourceRect, const gfx::Vector2d& destOffset, bool partialUpdate);
|
|
|
| bool layerIsOpaque() const { return m_layerIsOpaque; }
|
|
|
|
|