| Index: cc/skpicture_canvas_layer_texture_updater.cc
|
| diff --git a/cc/skpicture_canvas_layer_texture_updater.cc b/cc/skpicture_canvas_layer_texture_updater.cc
|
| index 36048f7569cedc9546fe119e27599c7ab71e8857..b114683f9e9f9b4aa3ea1bf153323a73670a0e5b 100644
|
| --- a/cc/skpicture_canvas_layer_texture_updater.cc
|
| +++ b/cc/skpicture_canvas_layer_texture_updater.cc
|
| @@ -13,7 +13,7 @@
|
|
|
| namespace cc {
|
|
|
| -SkPictureCanvasLayerTextureUpdater::SkPictureCanvasLayerTextureUpdater(scoped_ptr<LayerPainterChromium> painter)
|
| +SkPictureCanvasLayerTextureUpdater::SkPictureCanvasLayerTextureUpdater(scoped_ptr<LayerPainter> painter)
|
| : CanvasLayerTextureUpdater(painter.Pass())
|
| , m_layerIsOpaque(false)
|
| {
|
| @@ -23,7 +23,7 @@ SkPictureCanvasLayerTextureUpdater::~SkPictureCanvasLayerTextureUpdater()
|
| {
|
| }
|
|
|
| -void SkPictureCanvasLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize&, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, CCRenderingStats& stats)
|
| +void SkPictureCanvasLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize&, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, RenderingStats& stats)
|
| {
|
| SkCanvas* canvas = m_picture.beginRecording(contentRect.width(), contentRect.height());
|
| paintContents(canvas, contentRect, contentsWidthScale, contentsHeightScale, resultingOpaqueRect, stats);
|
| @@ -36,7 +36,7 @@ void SkPictureCanvasLayerTextureUpdater::drawPicture(SkCanvas* canvas)
|
| canvas->drawPicture(m_picture);
|
| }
|
|
|
| -void SkPictureCanvasLayerTextureUpdater::updateTexture(CCTextureUpdateQueue& queue, CCPrioritizedTexture* texture, const IntRect& sourceRect, const IntSize& destOffset, bool partialUpdate)
|
| +void SkPictureCanvasLayerTextureUpdater::updateTexture(TextureUpdateQueue& queue, PrioritizedTexture* texture, const IntRect& sourceRect, const IntSize& destOffset, bool partialUpdate)
|
| {
|
| TextureUploader::Parameters upload = { texture, NULL, &m_picture, { contentRect(), sourceRect, destOffset } };
|
| if (partialUpdate)
|
|
|