remove WEBKIT_USING_CG

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"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCommon.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "webkit/glue/webclipboard_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/support/webkit_support_gfx.h"
 
-#if WEBKIT_USING_CG
-#include <ApplicationServices/ApplicationServices.h>
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
 using WebKit::WebDragData;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebVector;
 
 MockWebClipboardImpl::MockWebClipboardImpl() {
 }
 
 MockWebClipboardImpl::~MockWebClipboardImpl() {
 }
@@ skipping 64 matching lines @@
   *fragmentEnd = static_cast<unsigned>(m_htmlText.length());
   return m_htmlText;
 }
 
 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.
-#if WEBKIT_USING_SKIA
   const SkBitmap& bitmap = m_image.getSkBitmap();
   SkAutoLockPixels lock(bitmap);
   webkit_support::EncodeBGRAPNG(static_cast<unsigned char*>(bitmap.getPixels()),
                                 bitmap.width(),
                                 bitmap.height(),
                                 bitmap.rowBytes(),
                                 false,
                                 &encoded_image);
-#elif WEBKIT_USING_CG
-  CGImageRef image = m_image.getCGImageRef();
-  CFDataRef image_data_ref =
-      CGDataProviderCopyData(CGImageGetDataProvider(image));
-  webkit_support::EncodeBGRAPNG(CFDataGetBytePtr(image_data_ref),
-                                CGImageGetWidth(image),
-                                CGImageGetHeight(image),
-                                CGImageGetBytesPerRow(image),
-                                false,
-                                &encoded_image);
-  CFRelease(image_data_ref);
-#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;
 }