Revert ANGLE rolls back to fe48632

gpu/command_buffer/service/gles2_cmd_decoder_passthrough_handlers.cc

 // Copyright (c) 2016 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 "gpu/command_buffer/service/gles2_cmd_decoder_passthrough.h"
 
 namespace gpu {
 namespace gles2 {
 
 // Custom Handlers
@@ skipping 841 matching lines @@
   if (c.pixels_shm_id != 0) {
     pixels = GetSharedMemoryAndSizeAs<uint8_t*>(
         c.pixels_shm_id, c.pixels_shm_offset, 0, &buffer_size);
     if (!pixels) {
       return error::kOutOfBounds;
     }
   }
 
   GLsizei bufsize = buffer_size;
   GLsizei length = 0;
-  GLsizei columns = 0;
-  GLsizei rows = 0;
   int32_t success = 0;
   error::Error error = DoReadPixels(x, y, width, height, format, type, bufsize,
-                                    &length, &columns, &rows, pixels, &success);
+                                    &length, pixels, &success);
   if (error != error::kNoError) {
     return error;
   }
   if (length > bufsize) {
     return error::kOutOfBounds;
   }
 
   typedef cmds::ReadPixels::Result Result;
   Result* result = nullptr;
   if (c.result_shm_id != 0) {
     result = GetSharedMemoryAs<Result*>(c.result_shm_id, c.result_shm_offset,
                                         sizeof(*result));
     if (!result) {
       return error::kOutOfBounds;
     }
     if (result->success != 0) {
       return error::kInvalidArguments;
     }
   }
 
   if (result) {
     result->success = success;
-    result->row_length = static_cast<uint32_t>(columns);
-    result->num_rows = static_cast<uint32_t>(rows);
+    result->row_length = static_cast<uint32_t>(width);
+    result->num_rows = static_cast<uint32_t>(height);
   }
 
   return error::kNoError;
 }
 
 error::Error GLES2DecoderPassthroughImpl::HandleShaderBinary(
     uint32_t immediate_data_size,
     const volatile void* cmd_data) {
   const volatile gles2::cmds::ShaderBinary& c =
       *static_cast<const volatile gles2::cmds::ShaderBinary*>(cmd_data);
@@ skipping 1768 matching lines @@
   // TODO(geofflang): Handle PIXEL_UNPACK_BUFFER case.
   const void* data = GetSharedMemoryAs<const void*>(
       c.data_shm_id, c.data_shm_offset, image_size);
   return DoCompressedTexSubImage3D(
       target, level, xoffset, yoffset, zoffset, width, height, depth,
       format, image_size, data);
 }
 
 }  // namespace gles2
 }  // namespace gpu