remove WEBKIT_USING_CG

webkit/glue/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/glue/webclipboard_impl.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.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/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/custom_data_helper.h"
 #include "webkit/glue/scoped_clipboard_writer_glue.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webkit_glue.h"
 
-#if WEBKIT_USING_CG
-#include "skia/ext/skia_utils_mac.h"
-#endif
-
 using WebKit::WebClipboard;
 using WebKit::WebData;
 using WebKit::WebDragData;
 using WebKit::WebImage;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebVector;
 
 namespace webkit_glue {
 
@@ skipping 166 matching lines @@
   scw.WriteBookmark(title, url.spec());
   scw.WriteHTML(UTF8ToUTF16(URLToMarkup(url, title)), "");
   scw.WriteText(UTF8ToUTF16(std::string(url.spec())));
 }
 
 void WebClipboardImpl::writeImage(
     const WebImage& image, const WebURL& url, const WebString& title) {
   ScopedClipboardWriterGlue scw(client_);
 
   if (!image.isNull()) {
-#if WEBKIT_USING_SKIA
     const SkBitmap& bitmap = image.getSkBitmap();
-#elif WEBKIT_USING_CG
-    const SkBitmap& bitmap = gfx::CGImageToSkBitmap(image.getCGImageRef());
-#endif
     SkAutoLockPixels locked(bitmap);
     scw.WriteBitmapFromPixels(bitmap.getPixels(), image.size());
   }
 
   if (!url.isEmpty()) {
     scw.WriteBookmark(title, url.spec());
 #if !defined(OS_MACOSX)
     // When writing the image, we also write the image markup so that pasting
     // into rich text editors, such as Gmail, reveals the image. We also don't
     // want to call writeText(), since some applications (WordPad) don't pick
@@ skipping 37 matching lines @@
       break;
 #endif
     default:
       NOTREACHED();
       return false;
   }
   return true;
 }
 
 }  // namespace webkit_glue