Map webkit glue when Mac build uses Skia.

webkit/glue/webkit_glue.cc

 // Copyright (c) 2011 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/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include <objidl.h>
 #include <mlang.h>
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
@@ skipping 252 matching lines @@
     DumpLeakedObject(__FILE__, __LINE__, "WebFrame", count);
 #endif
 }
 
 bool DecodeImage(const std::string& image_data, SkBitmap* image) {
   WebData web_data(image_data.data(), image_data.length());
   WebImage web_image(WebImage::fromData(web_data, WebSize()));
   if (web_image.isNull())
     return false;
 
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && !defined(USE_SKIA)
   *image = gfx::CGImageToSkBitmap(web_image.getCGImageRef());
 #else
   *image = web_image.getSkBitmap();
 #endif
   return true;
 }
 
 // NOTE: This pair of conversion functions are here instead of in glue_util.cc
 // since that file will eventually die.  This pair of functions will need to
 // remain as the concept of a file-path specific character encoding string type
@@ skipping 128 matching lines @@
   NOTIMPLEMENTED();
   return NULL;
 #endif
 }
 
 int GetGlyphPageCount() {
   return WebGlyphCache::pageCount();
 }
 
 } // namespace webkit_glue