Port WebImage to CG and rework the Skia version so that WebImage just has a...

webkit/webkit.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'feature_defines': [
       'ENABLE_CHANNEL_MESSAGING=1',
       'ENABLE_DATABASE=1',
       'ENABLE_DATAGRID=1',
@@ skipping 4252 matching lines @@
         'api/src/MediaPlayerPrivateChromium.cpp',
         'api/src/ResourceHandle.cpp',
         'api/src/TemporaryGlue.h',
         'api/src/WebCache.cpp',
         'api/src/WebCString.cpp',
         'api/src/WebData.cpp',
         'api/src/WebDragData.cpp',
         'api/src/WebForm.cpp',
         'api/src/WebHistoryItem.cpp',
         'api/src/WebHTTPBody.cpp',
+        'api/src/WebImageCG.cpp',
         'api/src/WebImageSkia.cpp',
         'api/src/WebInputEvent.cpp',
         'api/src/WebKit.cpp',
         'api/src/WebMediaPlayerClientImpl.cpp',
         'api/src/WebMediaPlayerClientImpl.h',
         'api/src/WebPluginListBuilderImpl.cpp',
         'api/src/WebPluginListBuilderImpl.h',
         'api/src/WebString.cpp',
         'api/src/WebURL.cpp',
         'api/src/WebURLRequest.cpp',
@@ skipping 20 matching lines @@
         }, { # else: OS!="linux"
           'sources/': [
             ['exclude', '/gtk/'],
             ['exclude', '/x11/'],
           ],
         }],
         ['OS=="mac"', {
           'include_dirs': [
             'api/public/mac',
           ],
-          'sources!': [
-            'api/src/WebImageSkia.cpp',
+          'sources/': [
+            ['exclude', 'Skia\\.cpp$'],
           ],
         }, { # else: OS!="mac"
-          'sources/': [['exclude', '/mac/']],
+          'sources/': [
+            ['exclude', '/mac/'],
+            ['exclude', 'CG\\.cpp$'],
+          ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             'api/public/win',
           ],
         }, { # else: OS!="win"
           'sources/': [['exclude', '/win/']],
         }],
       ],
     },
@@ skipping 557 matching lines @@
             '../third_party/WebKit/WebCore/inspector/front-end/Images/userInputPreviousIcon.png',
             '../third_party/WebKit/WebCore/inspector/front-end/Images/warningIcon.png',
             '../third_party/WebKit/WebCore/inspector/front-end/Images/warningMediumIcon.png',
             '../third_party/WebKit/WebCore/inspector/front-end/Images/warningsErrors.png',
           ],
         },
       ],
     },
   ],
 }