Fix RGBA pixel layout when reading image from clipboard.

webkit/tools/test_shell/mock_webclipboard_impl.cc

 // Copyright (c) 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 "webkit/tools/test_shell/mock_webclipboard_impl.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 87 matching lines @@
 }
 
 WebKit::WebData MockWebClipboardImpl::readImage(
     WebKit::WebClipboard::Buffer buffer) {
   std::string data;
   std::vector<unsigned char> encoded_image;
   // TODO(dcheng): Verify that we can assume the image is ARGB8888. Note that
   // for endianess reasons, it will be BGRA8888 on Windows.
   const SkBitmap& bitmap = m_image.getSkBitmap();
   SkAutoLockPixels lock(bitmap);
+#if defined(OS_ANDROID)
+  webkit_support::EncodeRGBAPNG(static_cast<unsigned char*>(bitmap.getPixels()),
+                                bitmap.width(),
+                                bitmap.height(),
+                                bitmap.rowBytes(),
+                                &encoded_image);
+#else
   webkit_support::EncodeBGRAPNG(static_cast<unsigned char*>(bitmap.getPixels()),
                                 bitmap.width(),
                                 bitmap.height(),
                                 bitmap.rowBytes(),
                                 false,
                                 &encoded_image);
+#endif
   data.assign(reinterpret_cast<char*>(vector_as_array(&encoded_image)),
               encoded_image.size());
   return data;
 }
 
 WebKit::WebString MockWebClipboardImpl::readCustomData(
     WebKit::WebClipboard::Buffer buffer,
     const WebKit::WebString& type) {
   std::map<string16, string16>::const_iterator it = m_customData.find(type);
   if (it != m_customData.end())
@@ skipping 64 matching lines @@
   }
 }
 
 void MockWebClipboardImpl::clear() {
   m_plainText = WebString();
   m_htmlText = WebString();
   m_image.reset();
   m_customData.clear();
   m_writeSmartPaste = false;
 }