Move simple png encoding for image_diff into tools/

webkit/support/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/support/mock_webclipboard_impl.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/WebKit/public/platform/WebCommon.h"
 #include "third_party/WebKit/public/platform/WebDragData.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "ui/base/clipboard/clipboard.h"
+#include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/size.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/renderer/clipboard_utils.h"
-#include "webkit/support/webkit_support_gfx.h"
 
 using WebKit::WebDragData;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebVector;
 
 MockWebClipboardImpl::MockWebClipboardImpl() {
 }
 
 MockWebClipboardImpl::~MockWebClipboardImpl() {
@@ skipping 68 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);
+  gfx::PNGCodec::Encode(static_cast<unsigned char*>(bitmap.getPixels()),
 #if defined(OS_ANDROID)
-  webkit_support::EncodeRGBAPNG(static_cast<unsigned char*>(bitmap.getPixels()),
-                                bitmap.width(),
-                                bitmap.height(),
-                                bitmap.rowBytes(),
-                                &encoded_image);
+                        gfx::PNGCodec::FORMAT_RGBA,
 #else
-  webkit_support::EncodeBGRAPNG(static_cast<unsigned char*>(bitmap.getPixels()),
-                                bitmap.width(),
-                                bitmap.height(),
-                                bitmap.rowBytes(),
-                                false,
-                                &encoded_image);
+                        gfx::PNGCodec::FORMAT_BGRA,
 #endif
+                        gfx::Size(bitmap.width(), bitmap.height()),
+                        bitmap.rowBytes(),
+                        false /* discard_transparency */,
+                        std::vector<gfx::PNGCodec::Comment>(),
+                        &encoded_image);
   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<base::string16, base::string16>::const_iterator it =
       m_customData.find(type);
@@ skipping 64 matching lines @@
   }
 }
 
 void MockWebClipboardImpl::clear() {
   m_plainText = WebString();
   m_htmlText = WebString();
   m_image.reset();
   m_customData.clear();
   m_writeSmartPaste = false;
 }