cc: Use SkPMColor consistently on readback.

cc/output/gl_renderer.cc

 // Copyright 2010 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/output/gl_renderer.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <string>
@@ skipping 2176 matching lines @@
         context_->mapBufferCHROMIUM(GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM,
                                     GL_READ_ONLY));
 
     if (src_pixels) {
       size_t row_bytes = size.width() * 4;
       int num_rows = size.height();
       size_t total_bytes = num_rows * row_bytes;
       for (size_t dest_y = 0; dest_y < total_bytes; dest_y += row_bytes) {
         // Flip Y axis.
         size_t src_y = total_bytes - dest_y - row_bytes;
-        // Swizzle BGRA -> RGBA.
+        // Swizzle OpenGL -> Skia byte order.
         for (size_t x = 0; x < row_bytes; x += 4) {
-          dest_pixels[dest_y + (x + 0)] = src_pixels[src_y + (x + 2)];
-          dest_pixels[dest_y + (x + 1)] = src_pixels[src_y + (x + 1)];
-          dest_pixels[dest_y + (x + 2)] = src_pixels[src_y + (x + 0)];
-          dest_pixels[dest_y + (x + 3)] = src_pixels[src_y + (x + 3)];
+          dest_pixels[dest_y + x + SK_R32_SHIFT/8] = src_pixels[src_y + x + 0];
+          dest_pixels[dest_y + x + SK_G32_SHIFT/8] = src_pixels[src_y + x + 1];
+          dest_pixels[dest_y + x + SK_B32_SHIFT/8] = src_pixels[src_y + x + 2];
+          dest_pixels[dest_y + x + SK_A32_SHIFT/8] = src_pixels[src_y + x + 3];
         }
       }
 
       GLC(context_, context_->unmapBufferCHROMIUM(
           GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM));
     }
     GLC(context_, context_->bindBuffer(GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM,
                                        0));
     GLC(context_, context_->deleteBuffer(source_buffer));
   }
@@ skipping 569 matching lines @@
     resource_provider_->DeleteResource(on_demand_tile_raster_resource_id_);
 
   ReleaseRenderPassTextures();
 }
 
 bool GLRenderer::IsContextLost() {
   return (context_->getGraphicsResetStatusARB() != GL_NO_ERROR);
 }
 
 }  // namespace cc