cc: Adding support for RGBA_4444 tile textures

cc/scheduler/texture_uploader_unittest.cc

 // Copyright 2012 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 "cc/scheduler/texture_uploader.h"
 
 #include "cc/base/util.h"
 #include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/resources/prioritized_resource.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 133 matching lines @@
   }
 
  private:
   unsigned result_available_;
   unsigned unpack_alignment_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWebGraphicsContext3DTextureUpload);
 };
 
 void UploadTexture(TextureUploader* uploader,
-                   WGC3Denum format,
+                   ResourceFormat format,
                    gfx::Size size,
                    const uint8* data) {
   uploader->Upload(data,
                    gfx::Rect(size),
                    gfx::Rect(size),
                    gfx::Vector2d(),
                    format,
                    size);
 }
 
 TEST(TextureUploaderTest, NumBlockingUploads) {
   scoped_ptr<TestWebGraphicsContext3DTextureUpload> fake_context(
       new TestWebGraphicsContext3DTextureUpload);
   scoped_ptr<TextureUploader> uploader =
       TextureUploader::Create(fake_context.get(), false, false);
 
   fake_context->SetResultAvailable(0);
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
   EXPECT_EQ(1u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
   EXPECT_EQ(2u, uploader->NumBlockingUploads());
 
   fake_context->SetResultAvailable(1);
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
-  UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
 }
 
 TEST(TextureUploaderTest, MarkPendingUploadsAsNonBlocking) {
   scoped_ptr<TestWebGraphicsContext3DTextureUpload> fake_context(
       new TestWebGraphicsContext3DTextureUpload);
   scoped_ptr<TextureUploader> uploader =
       TextureUploader::Create(fake_context.get(), false, false);
 
   fake_context->SetResultAvailable(0);
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
-  UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
   EXPECT_EQ(2u, uploader->NumBlockingUploads());
 
   uploader->MarkPendingUploadsAsNonBlocking();
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
   EXPECT_EQ(1u, uploader->NumBlockingUploads());
 
   fake_context->SetResultAvailable(1);
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
-  UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(), NULL);
   uploader->MarkPendingUploadsAsNonBlocking();
   EXPECT_EQ(0u, uploader->NumBlockingUploads());
 }
 
 TEST(TextureUploaderTest, UploadContentsTest) {
   scoped_ptr<TestWebGraphicsContext3DTextureUpload> fake_context(
       new TestWebGraphicsContext3DTextureUpload);
   scoped_ptr<TextureUploader> uploader =
       TextureUploader::Create(fake_context.get(), false, false);
   uint8 buffer[256 * 256 * 4];
 
   // Upload a tightly packed 256x256 RGBA texture.
   memset(buffer, 0, sizeof(buffer));
   for (int i = 0; i < 256; ++i) {
     // Mark the beginning and end of each row, for the test.
     buffer[i * 4 * 256] = 0x1;
     buffer[(i + 1) * 4 * 256 - 1] = 0x2;
   }
-  UploadTexture(uploader.get(), GL_RGBA, gfx::Size(256, 256), buffer);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(256, 256), buffer);
 
   // Upload a tightly packed 41x43 RGBA texture.
   memset(buffer, 0, sizeof(buffer));
   for (int i = 0; i < 43; ++i) {
     // Mark the beginning and end of each row, for the test.
     buffer[i * 4 * 41] = 0x1;
     buffer[(i + 1) * 4 * 41 - 1] = 0x2;
   }
-  UploadTexture(uploader.get(), GL_RGBA, gfx::Size(41, 43), buffer);
+  UploadTexture(uploader.get(), RGBA_8888, gfx::Size(41, 43), buffer);
 
   // Upload a tightly packed 82x86 LUMINANCE texture.
   memset(buffer, 0, sizeof(buffer));
   for (int i = 0; i < 86; ++i) {
     // Mark the beginning and end of each row, for the test.
     buffer[i * 1 * 82] = 0x1;
     buffer[(i + 1) * 82 - 1] = 0x2;
   }
-  UploadTexture(uploader.get(), GL_LUMINANCE, gfx::Size(82, 86), buffer);
+  UploadTexture(uploader.get(), LUMINANCE_8, gfx::Size(82, 86), buffer);
 }
 
 }  // namespace
 }  // namespace cc