cc: Remove LayerTextureUpdater::Texture::updateRect() callback.

cc/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp

Index: cc/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp
diff --git a/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp b/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp
index 3ae8aefb82fe1da6dc5209419527eb74dcfb5e37..e056446cbcd6ada1f667c957ab2859e9f275a004 100644
--- a/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp
+++ b/cc/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp
@@ -12,30 +12,9 @@
 #include "CCProxy.h"
 #include "LayerPainterChromium.h"
 #include "SkCanvas.h"
-#include "SkGpuDevice.h"
-#include <public/WebGraphicsContext3D.h>
-#include <public/WebSharedGraphicsContext3D.h>
-
-using WebKit::WebGraphicsContext3D;
-using WebKit::WebSharedGraphicsContext3D;
 
 namespace cc {
 
-static PassOwnPtr<SkCanvas> createAcceleratedCanvas(GrContext* grContext,
-                                                    IntSize canvasSize,
-                                                    unsigned textureId)
-{
-    GrPlatformTextureDesc textureDesc;
-    textureDesc.fFlags = kRenderTarget_GrPlatformTextureFlag;
-    textureDesc.fWidth = canvasSize.width();
-    textureDesc.fHeight = canvasSize.height();
-    textureDesc.fConfig = kSkia8888_GrPixelConfig;
-    textureDesc.fTextureHandle = textureId;
-    SkAutoTUnref<GrTexture> target(grContext->createPlatformTexture(textureDesc));
-    SkAutoTUnref<SkDevice> device(new SkGpuDevice(grContext, target.get()));
-    return adoptPtr(new SkCanvas(device.get()));
-}
-
 FrameBufferSkPictureCanvasLayerTextureUpdater::Texture::Texture(FrameBufferSkPictureCanvasLayerTextureUpdater* textureUpdater, PassOwnPtr<CCPrioritizedTexture> texture)
     : LayerTextureUpdater::Texture(texture)
     , m_textureUpdater(textureUpdater)
@@ -46,13 +25,9 @@ FrameBufferSkPictureCanvasLayerTextureUpdater::Texture::~Texture()
 {
 }
 
-void FrameBufferSkPictureCanvasLayerTextureUpdater::Texture::updateRect(CCResourceProvider* resourceProvider, const IntRect& sourceRect, const IntSize& destOffset)
+void FrameBufferSkPictureCanvasLayerTextureUpdater::Texture::update(CCTextureUpdateQueue& queue, const IntRect& sourceRect, const IntSize& destOffset, bool partialUpdate, CCRenderingStats&)
 {
-    WebGraphicsContext3D* sharedContext = CCProxy::hasImplThread() ? WebSharedGraphicsContext3D::compositorThreadContext() : WebSharedGraphicsContext3D::mainThreadContext();
-    GrContext* sharedGrContext = CCProxy::hasImplThread() ? WebSharedGraphicsContext3D::compositorThreadGrContext() : WebSharedGraphicsContext3D::mainThreadGrContext();
-    if (!sharedContext || !sharedGrContext)
-        return;
-    textureUpdater()->updateTextureRect(sharedContext, sharedGrContext, resourceProvider, texture(), sourceRect, destOffset);
+    textureUpdater()->updateTexture(queue, texture(), sourceRect, destOffset, partialUpdate);
 }
 
 PassRefPtr<FrameBufferSkPictureCanvasLayerTextureUpdater> FrameBufferSkPictureCanvasLayerTextureUpdater::create(PassOwnPtr<LayerPainterChromium> painter)
@@ -80,40 +55,5 @@ LayerTextureUpdater::SampledTexelFormat FrameBufferSkPictureCanvasLayerTextureUp
     return LayerTextureUpdater::SampledTexelFormatRGBA;
 }
 
-void FrameBufferSkPictureCanvasLayerTextureUpdater::updateTextureRect(WebGraphicsContext3D* context, GrContext* grContext, CCResourceProvider* resourceProvider, CCPrioritizedTexture* texture, const IntRect& sourceRect, const IntSize& destOffset)
-{
-    texture->acquireBackingTexture(resourceProvider);
-    // Flush the context in which the backing texture is created so that it
-    // is available in other shared contexts. It is important to do here
-    // because the backing texture is created in one context while it is
-    // being written to in another.
-    resourceProvider->flush();
-    CCResourceProvider::ScopedWriteLockGL lock(resourceProvider, texture->resourceId());
-
-    // Make sure ganesh uses the correct GL context.
-    context->makeContextCurrent();
-    // Create an accelerated canvas to draw on.
-    OwnPtr<SkCanvas> canvas = createAcceleratedCanvas(grContext, texture->size(), lock.textureId());
-
-    // The compositor expects the textures to be upside-down so it can flip
-    // the final composited image. Ganesh renders the image upright so we
-    // need to do a y-flip.
-    canvas->translate(0.0, texture->size().height());
-    canvas->scale(1.0, -1.0);
-    // Clip to the destination on the texture that must be updated.
-    canvas->clipRect(SkRect::MakeXYWH(destOffset.width(), destOffset.height(), sourceRect.width(), sourceRect.height()));
-    // Translate the origin of contentRect to that of destRect.
-    // Note that destRect is defined relative to sourceRect.
-    canvas->translate(contentRect().x() - sourceRect.x() + destOffset.width(),
-                      contentRect().y() - sourceRect.y() + destOffset.height());
-    drawPicture(canvas.get());
-
-    // Flush ganesh context so that all the rendered stuff appears on the texture.
-    grContext->flush();
-
-    // Flush the GL context so rendering results from this context are visible in the compositor's context.
-    context->flush();
-}
-
 } // namespace cc
 #endif // USE(ACCELERATED_COMPOSITING)