cc: TextureUploader - Reset GL_UNPACK_ALIGNMENT to 4 before uploading images.

cc/test/test_web_graphics_context_3d.cc

 // Copyright 2013 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/test/test_web_graphics_context_3d.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 49 matching lines @@
       next_shader_id_(2000),
       max_texture_size_(2048),
       reshape_called_(false),
       width_(0),
       height_(0),
       scale_factor_(-1.f),
       test_support_(NULL),
       last_update_type_(NoUpdate),
       next_insert_sync_point_(1),
       last_waited_sync_point_(0),
+      unpack_alignment_(4),
       bound_buffer_(0),
       weak_ptr_factory_(this) {
   CreateNamespace();
 }
 
 TestWebGraphicsContext3D::~TestWebGraphicsContext3D() {
   base::AutoLock lock(g_shared_namespace_lock.Get());
   namespace_ = NULL;
 }
 
@@ skipping 280 matching lines @@
     *params = 1;
 }
 
 void TestWebGraphicsContext3D::getIntegerv(
     GLenum pname,
     GLint* value) {
   if (pname == GL_MAX_TEXTURE_SIZE)
     *value = max_texture_size_;
   else if (pname == GL_ACTIVE_TEXTURE)
     *value = GL_TEXTURE0;
+  else if (pname == GL_UNPACK_ALIGNMENT)
+    *value = unpack_alignment_;
 }
 
 void TestWebGraphicsContext3D::getProgramiv(GLuint program,
                                             GLenum pname,
                                             GLint* value) {
   if (pname == GL_LINK_STATUS)
     *value = 1;
 }
 
 void TestWebGraphicsContext3D::getShaderiv(GLuint shader,
@@ skipping 131 matching lines @@
   buffer->size = size;
   if (data != NULL)
     memcpy(buffer->pixels.get(), data, size);
   if (buffer->target == GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM)
     current_used_transfer_buffer_usage_bytes_ += buffer->size - old_size;
   max_used_transfer_buffer_usage_bytes_ =
       std::max(max_used_transfer_buffer_usage_bytes_,
                current_used_transfer_buffer_usage_bytes_);
 }
 
+void TestWebGraphicsContext3D::pixelStorei(GLenum pname, GLint param) {
+  switch (pname) {
+    case GL_UNPACK_ALIGNMENT:
+      // Param should be a power of two <= 8.
+      EXPECT_EQ(0, param & (param - 1));
+      EXPECT_GE(8, param);
+      switch (param) {
+        case 1:
+        case 2:
+        case 4:
+        case 8:
+          unpack_alignment_ = param;
+          break;
+        default:
+          break;
+      }
+      break;
+    default:
+      break;
+  }
+}
+
 void* TestWebGraphicsContext3D::mapBufferCHROMIUM(GLenum target,
                                                   GLenum access) {
   base::AutoLock lock(namespace_->lock);
   base::ScopedPtrHashMap<unsigned, Buffer>& buffers = namespace_->buffers;
   DCHECK_GT(buffers.count(bound_buffer_), 0u);
   DCHECK_EQ(target, buffers.get(bound_buffer_)->target);
   if (times_map_buffer_chromium_succeeds_ >= 0) {
     if (!times_map_buffer_chromium_succeeds_) {
       return NULL;
     }
@@ skipping 182 matching lines @@
 
 TestWebGraphicsContext3D::Buffer::Buffer() : target(0), size(0) {}
 
 TestWebGraphicsContext3D::Buffer::~Buffer() {}
 
 TestWebGraphicsContext3D::Image::Image() {}
 
 TestWebGraphicsContext3D::Image::~Image() {}
 
 }  // namespace cc