remove WEBKIT_USING_CG

We haven't set WEBKIT_USING_CG for several stable releases and do not intend
to set it again in the forseeable future. This deletes the now-dead code

BUG=none
TEST=compiles


Review URL: https://chromiumcodereview.appspot.com/10392018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136369 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 9 deletions

diff --git a/webkit/glue/image_decoder.cc b/webkit/glue/image_decoder.cc
index f17d2c1..83b935c 100644
--- a/webkit/glue/image_decoder.cc
+++ b/webkit/glue/image_decoder.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -9,10 +9,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
-#if WEBKIT_USING_CG
-#include "skia/ext/skia_utils_mac.h"
-#endif
-
 using WebKit::WebData;
 using WebKit::WebImage;
 
@@ -31,11 +27,7 @@ ImageDecoder::~ImageDecoder() {
 SkBitmap ImageDecoder::Decode(const unsigned char* data, size_t size) const {
   const WebImage& image = WebImage::fromData(
       WebData(reinterpret_cast<const char*>(data), size), desired_icon_size_);
-#if WEBKIT_USING_SKIA
   return image.getSkBitmap();
-#elif WEBKIT_USING_CG
-  return gfx::CGImageToSkBitmap(image.getCGImageRef());
-#endif
 }
 
 }  // namespace webkit_glue