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

This is the first step towards cleaning up and simplifying the resource
update system. Eliminates the LayerTextureUpdater::Texture::updateRect()
callback by moving some logic to CCResourceProvider. Remaining logic is
now contained in LayerTextureUpdater::Texture::update(). The logic itself
is not changed, this is only re-factoring.

BUG=154472
TEST=manual


Review URL: https://chromiumcodereview.appspot.com/11074009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161752 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 3 deletions

diff --git a/cc/texture_uploader.h b/cc/texture_uploader.h
index 5505204..950fb82 100644
--- a/cc/texture_uploader.h
+++ b/cc/texture_uploader.h
@@ -5,17 +5,29 @@
 #ifndef TextureUploader_h
 #define TextureUploader_h
 
-#include "LayerTextureUpdater.h"
+#include "IntRect.h"
+
+class SkBitmap;
+class SkPicture;
 
 namespace cc {
 
+class CCPrioritizedTexture;
+class CCResourceProvider;
+
 class TextureUploader {
 public:
-    struct Parameters {
-        LayerTextureUpdater::Texture* texture;
+    struct Geometry {
+        IntRect contentRect;
         IntRect sourceRect;
         IntSize destOffset;
     };
+    struct Parameters {
+        CCPrioritizedTexture* texture;
+        const SkBitmap* bitmap;
+        SkPicture* picture;
+        Geometry geometry;
+    };
 
     virtual ~TextureUploader() { }