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

cc/ImageLayerChromium.cpp

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "ImageLayerChromium.h"
 
 #include "base/compiler_specific.h"
 #include "CCLayerTreeHost.h"
+#include "CCTextureUpdateQueue.h"
 #include "LayerTextureUpdater.h"
 #include "PlatformColor.h"
 
 namespace cc {
 
 class ImageLayerTextureUpdater : public LayerTextureUpdater {
 public:
     class Texture : public LayerTextureUpdater::Texture {
     public:
         Texture(ImageLayerTextureUpdater* textureUpdater, PassOwnPtr<CCPrioritizedTexture> texture)
             : LayerTextureUpdater::Texture(texture)
             , m_textureUpdater(textureUpdater)
         {
         }
 
-        virtual void updateRect(CCResourceProvider* resourceProvider, const IntRect& sourceRect, const IntSize& destOffset) OVERRIDE
+        virtual void update(CCTextureUpdateQueue& queue, const IntRect& sourceRect, const IntSize& destOffset, bool partialUpdate, CCRenderingStats&) OVERRIDE
         {
-            textureUpdater()->updateTextureRect(resourceProvider, texture(), sourceRect, destOffset);
+            textureUpdater()->updateTexture(queue, texture(), sourceRect, destOffset, partialUpdate);
         }
 
     private:
         ImageLayerTextureUpdater* textureUpdater() { return m_textureUpdater; }
 
         ImageLayerTextureUpdater* m_textureUpdater;
     };
 
     static PassRefPtr<ImageLayerTextureUpdater> create()
     {
         return adoptRef(new ImageLayerTextureUpdater());
     }
 
     virtual ~ImageLayerTextureUpdater() { }
 
     virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(
         CCPrioritizedTextureManager* manager) OVERRIDE
     {
         return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
     }
 
     virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) OVERRIDE
     {
         return PlatformColor::sameComponentOrder(textureFormat) ?
                 LayerTextureUpdater::SampledTexelFormatRGBA : LayerTextureUpdater::SampledTexelFormatBGRA;
     }
 
-    void updateTextureRect(CCResourceProvider* resourceProvider, CCPrioritizedTexture* texture, const IntRect& sourceRect, const IntSize& destOffset)
+    void updateTexture(CCTextureUpdateQueue& queue, CCPrioritizedTexture* texture, const IntRect& sourceRect, const IntSize& destOffset, bool partialUpdate)
     {
         // Source rect should never go outside the image pixels, even if this
         // is requested because the texture extends outside the image.
         IntRect clippedSourceRect = sourceRect;
         IntRect imageRect = IntRect(0, 0, m_bitmap.width(), m_bitmap.height());
         clippedSourceRect.intersect(imageRect);
 
         IntSize clippedDestOffset = destOffset + IntSize(clippedSourceRect.location() - sourceRect.location());
 
-        SkAutoLockPixels lock(m_bitmap);
-        texture->upload(resourceProvider, static_cast<const uint8_t*>(m_bitmap.getPixels()), imageRect, clippedSourceRect, clippedDestOffset);
+        TextureUploader::Parameters upload = { texture, &m_bitmap, NULL, { imageRect, clippedSourceRect, clippedDestOffset } };
+        if (partialUpdate)
+            queue.appendPartialUpload(upload);
+        else
+            queue.appendFullUpload(upload);
     }
 
     void setBitmap(const SkBitmap& bitmap)
     {
         m_bitmap = bitmap;
     }
 
 private:
     ImageLayerTextureUpdater() { }
 
@@ skipping 74 matching lines @@
 }
 
 bool ImageLayerChromium::needsContentsScale() const
 {
     // Contents scale is not need for image layer because this can be done in compositor more efficiently.
     return false;
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)