Merged in recent changes to command buffer code.

gpu/command_buffer/common/gles2_cmd_utils.cc

 // Copyright (c) 2006-2009 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.
 
 // This file is here so other GLES2 related files can have a common set of
 // includes where appropriate.
 
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 
@@ skipping 314 matching lines @@
     default:
        return 0;
   }
 }
 
 }  // anonymous namespace
 
 // Returns the amount of data glTexImage2D or glTexSubImage2D will access.
 uint32 GLES2Util::ComputeImageDataSize(
     int width, int height, int format, int type, int unpack_alignment) {
-  uint32 bytes_per_group = BytesPerElement(ElementsPerGroup(format, type));
+  uint32 bytes_per_group =
+      BytesPerElement(type) * ElementsPerGroup(format, type);
   uint32 row_size = width * bytes_per_group;
   if (height > 1) {
     uint32 padded_row_size = ((row_size + unpack_alignment - 1) /
                               unpack_alignment) * unpack_alignment;
-    return height - 1 * padded_row_size + row_size;
+    return (height - 1) * padded_row_size + row_size;
   }
   return height * row_size;
 }
 
 }  // namespace gles2
 }  // namespace command_buffer