cc: Adding support for RGBA_4444 tile textures

cc/scheduler/texture_uploader.h

Index: cc/scheduler/texture_uploader.h
diff --git a/cc/scheduler/texture_uploader.h b/cc/scheduler/texture_uploader.h
index 1457bedb7277d190d58fe73f7bceeaa5d128eedc..1d12f6630677a5a49513df952d883bd6e025a028 100644
--- a/cc/scheduler/texture_uploader.h
+++ b/cc/scheduler/texture_uploader.h
@@ -11,6 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_deque.h"
+#include "cc/resources/resource_provider.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
 namespace WebKit { class WebGraphicsContext3D; }
@@ -30,7 +31,9 @@ class CC_EXPORT TextureUploader {
       bool use_map_tex_sub_image,
       bool use_shallow_flush) {
     return make_scoped_ptr(
-        new TextureUploader(context, use_map_tex_sub_image, use_shallow_flush));
+        new TextureUploader(context,
+                            use_map_tex_sub_image,
+                            use_shallow_flush));
   }
   ~TextureUploader();
 
@@ -47,7 +50,8 @@ class CC_EXPORT TextureUploader {
               gfx::Rect source_rect,
               gfx::Vector2d dest_offset,
               GLenum format,
-              gfx::Size size);
+              gfx::Size size,
+              ResourceProvider::TextureType type);
 
   void Flush();
   void ReleaseCachedQueries();
@@ -97,12 +101,14 @@ class CC_EXPORT TextureUploader {
                              gfx::Rect image_rect,
                              gfx::Rect source_rect,
                              gfx::Vector2d dest_offset,
-                             GLenum format);
+                             GLenum format,
+                             ResourceProvider::TextureType type);
   void UploadWithMapTexSubImage(const uint8* image,
                                 gfx::Rect image_rect,
                                 gfx::Rect source_rect,
                                 gfx::Vector2d dest_offset,
-                                GLenum format);
+                                GLenum format,
+                                ResourceProvider::TextureType type);
 
   WebKit::WebGraphicsContext3D* context_;
   ScopedPtrDeque<Query> pending_queries_;