Extract webkit api target from webkit.gyp

(in preparation for upstreaming the api)

Review URL: http://codereview.chromium.org/340049

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

4 files changed, 373 insertions, 316 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index ca58620..470b71a 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3201,7 +3201,7 @@
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
         '../webkit/webkit.gyp:glue',
-        '../webkit/webkit.gyp:webkit',
+        '../webkit/api/WebKit.gyp:webkit',
       ],
       'include_dirs': [
         '..',
@@ -3389,7 +3389,7 @@
       'msvs_guid': 'C78D02D0-A366-4EC6-A248-AA8E64C4BA18',
       'dependencies': [
         '../base/base.gyp:base',
-        '../webkit/webkit.gyp:webkit',
+        '../webkit/api/WebKit.gyp:webkit',
       ],
       'sources': [
         'worker/nativewebworker_impl.cc',
@@ -4376,7 +4376,7 @@
         '../net/net.gyp:net_resources',
         '../net/net.gyp:net_test_support',
         '../printing/printing.gyp:printing',
-        '../webkit/webkit.gyp:webkit',
+        '../webkit/api/WebKit.gyp:webkit',
         '../webkit/webkit.gyp:webkit_resources',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
@@ -6533,7 +6533,7 @@
               'syncapi',
               'test_support_unit',
               '../printing/printing.gyp:printing',
-              '../webkit/webkit.gyp:webkit',
+              '../webkit/api/WebKit.gyp:webkit',
               '../skia/skia.gyp:skia',
               '../testing/gtest.gyp:gtest',
               '../third_party/icu/icu.gyp:icui18n',
diff --git a/webkit/api/WebKit.gyp b/webkit/api/WebKit.gyp
new file mode 100644
index 0000000..9551e7f
--- /dev/null
+++ b/webkit/api/WebKit.gyp
@@ -0,0 +1,365 @@
+#
+# Copyright (C) 2009 Google Inc. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+{
+  'includes': [
+    # FIXME: change to ../features.gypi once upstreamed to WebKit/chromium/api.
+    '../../third_party/WebKit/WebKit/chromium/features.gypi',
+  ],
+  'variables': {
+    # We can't turn on warnings on Windows and Linux until we upstream the
+    # WebKit API.
+    'conditions': [
+      ['OS=="mac"', {
+        'chromium_code': 1,
+      }],
+    ],
+  },
+  'targets': [
+    {
+      'target_name': 'webkit',
+      'type': '<(library)',
+      'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65',
+      'dependencies': [
+        #FIXME: change to ../../WebCore/WebCore.gyp/WebCore.gyp:webcore once upstreamed.
+        '../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
+      ],
+      'include_dirs': [
+        'public',
+        'src',
+      ],
+      'defines': [
+        'WEBKIT_IMPLEMENTATION',
+      ],
+      'sources': [
+        'public/gtk/WebInputEventFactory.h',
+        'public/linux/WebFontRendering.h',
+        'public/x11/WebScreenInfoFactory.h',
+        'public/mac/WebInputEventFactory.h',
+        'public/mac/WebScreenInfoFactory.h',
+        'public/WebAccessibilityController.h',
+        'public/WebAccessibilityObject.h',
+        'public/WebAccessibilityRole.h',
+        'public/WebApplicationCacheHost.h',
+        'public/WebApplicationCacheHostClient.h',
+        'public/WebBindings.h',
+        'public/WebCache.h',
+        'public/WebCanvas.h',
+        'public/WebClipboard.h',
+        'public/WebColor.h',
+        'public/WebColorName.h',
+        'public/WebCommon.h',
+        'public/WebCompositionCommand.h',
+        'public/WebConsoleMessage.h',
+        'public/WebContextMenuData.h',
+        'public/WebCookie.h',
+        'public/WebCrossOriginPreflightResultCache.h',
+        'public/WebCString.h',
+        'public/WebCursorInfo.h',
+        'public/WebData.h',
+        'public/WebDatabase.h',
+        'public/WebDatabaseObserver.h',
+        'public/WebDataSource.h',
+        'public/WebDevToolsAgent.h',
+        'public/WebDevToolsAgentClient.h',
+        'public/WebDevToolsFrontend.h',
+        'public/WebDevToolsFrontendClient.h',
+        'public/WebDragData.h',
+        'public/WebEditingAction.h',
+        'public/WebFileChooserCompletion.h',
+        'public/WebFindOptions.h',
+        'public/WebFrame.h',
+        'public/WebFrameClient.h',
+        'public/WebFontCache.h',
+        'public/WebForm.h',
+        'public/WebHistoryItem.h',
+        'public/WebHTTPBody.h',
+        'public/WebImage.h',
+        'public/WebInputEvent.h',
+        'public/WebKit.h',
+        'public/WebKitClient.h',
+        'public/WebLocalizedString.h',
+        'public/WebMediaPlayer.h',
+        'public/WebMediaPlayerAction.h',
+        'public/WebMediaPlayerClient.h',
+        'public/WebMessagePortChannel.h',
+        'public/WebMessagePortChannelClient.h',
+        'public/WebMimeRegistry.h',
+        'public/WebNavigationType.h',
+        'public/WebNode.h',
+        'public/WebNonCopyable.h',
+        'public/WebNotification.h',
+        'public/WebNotificationPresenter.h',
+        'public/WebNotificationPermissionCallback.h',
+        'public/WebPlugin.h',
+        'public/WebPluginContainer.h',
+        'public/WebPluginListBuilder.h',
+        'public/WebPoint.h',
+        'public/WebPopupMenu.h',
+        'public/WebPopupMenuInfo.h',
+        'public/WebRange.h',
+        'public/WebRect.h',
+        'public/WebRuntimeFeatures.h',
+        'public/WebScreenInfo.h',
+        'public/WebScriptController.h',
+        'public/WebScriptSource.h',
+        'public/WebSearchableFormData.h',
+        'public/WebSecurityOrigin.h',
+        'public/WebSecurityPolicy.h',
+        'public/WebSettings.h',
+        'public/WebSize.h',
+        'public/WebSocketStreamError.h',
+        'public/WebSocketStreamHandle.h',
+        'public/WebSocketStreamHandleClient.h',
+        'public/WebStorageArea.h',
+        'public/WebStorageEventDispatcher.h',
+        'public/WebStorageNamespace.h',
+        'public/WebString.h',
+        'public/WebTextAffinity.h',
+        'public/WebTextDirection.h',
+        'public/WebURL.h',
+        'public/WebURLError.h',
+        'public/WebURLLoader.h',
+        'public/WebURLLoaderClient.h',
+        'public/WebURLRequest.h',
+        'public/WebURLResponse.h',
+        'public/WebVector.h',
+        'public/WebView.h',
+        'public/WebViewClient.h',
+        'public/WebWidget.h',
+        'public/WebWidgetClient.h',
+        'public/WebWorker.h',
+        'public/WebWorkerClient.h',
+        'public/win/WebInputEventFactory.h',
+        'public/win/WebSandboxSupport.h',
+        'public/win/WebScreenInfoFactory.h',
+        'public/win/WebScreenInfoFactory.h',
+        'src/ApplicationCacheHost.cpp',
+        'src/AssertMatchingEnums.cpp',
+        'src/AutocompletePopupMenuClient.cpp',
+        'src/AutocompletePopupMenuClient.h',
+        'src/BackForwardListClientImpl.cpp',
+        'src/BackForwardListClientImpl.h',
+        'src/ChromeClientImpl.cpp',
+        'src/ChromeClientImpl.h',
+        'src/ChromiumBridge.cpp',
+        'src/ChromiumCurrentTime.cpp',
+        'src/ChromiumThreading.cpp',
+        'src/ContextMenuClientImpl.cpp',
+        'src/ContextMenuClientImpl.h',
+        'src/DOMUtilitiesPrivate.cpp',
+        'src/DOMUtilitiesPrivate.h',
+        'src/DragClientImpl.cpp',
+        'src/DragClientImpl.h',
+        'src/EditorClientImpl.cpp',
+        'src/EditorClientImpl.h',
+        'src/FrameLoaderClientImpl.cpp',
+        'src/FrameLoaderClientImpl.h',
+        'src/EmptyWebFrameClientImpl.h',
+        'src/gtk/WebFontInfo.cpp',
+        'src/gtk/WebFontInfo.h',
+        'src/gtk/WebInputEventFactory.cpp',
+        'src/InspectorClientImpl.cpp',
+        'src/InspectorClientImpl.h',
+        'src/linux/WebFontRendering.cpp',
+        'src/x11/WebScreenInfoFactory.cpp',
+        'src/mac/WebInputEventFactory.mm',
+        'src/mac/WebScreenInfoFactory.mm',
+        'src/LocalizedStrings.cpp',
+        'src/MediaPlayerPrivateChromium.cpp',
+        'src/NotificationPresenterImpl.h',
+        'src/NotificationPresenterImpl.cpp',
+        'src/PasswordAutocompleteListener.h',
+        'src/PlatformMessagePortChannel.cpp',
+        'src/PlatformMessagePortChannel.h',
+        'src/ResourceHandle.cpp',
+        'src/SharedWorkerRepository.cpp',
+        'src/SocketStreamHandle.cpp',
+        'src/StorageAreaProxy.cpp',
+        'src/StorageAreaProxy.h',
+        'src/StorageEventDispatcherChromium.cpp',
+        'src/StorageEventDispatcherImpl.cpp',
+        'src/StorageEventDispatcherImpl.h',
+        'src/StorageNamespaceProxy.cpp',
+        'src/StorageNamespaceProxy.h',
+        'src/TemporaryGlue.h',
+        'src/WebAccessibilityController.cpp',
+        'src/WebAccessibilityObject.cpp',
+        'src/WebBindings.cpp',
+        'src/WebCache.cpp',
+        'src/WebColor.cpp',
+        'src/WebCrossOriginPreflightResultCache.cpp',
+        'src/WebCString.cpp',
+        'src/WebCursorInfo.cpp',
+        'src/WebData.cpp',
+        'src/WebDatabase.cpp',
+        'src/WebDataSourceImpl.cpp',
+        'src/WebDataSourceImpl.h',
+        'src/WebDragData.cpp',
+        'src/WebFileChooserCompletionImpl.cpp',
+        'src/WebFileChooserCompletionImpl.h',
+        'src/WebFontCache.cpp',
+        'src/WebForm.cpp',
+        'src/WebFrameImpl.cpp',
+        'src/WebFrameImpl.h',
+        'src/WebHistoryItem.cpp',
+        'src/WebHTTPBody.cpp',
+        'src/WebImageCG.cpp',
+        'src/WebImageSkia.cpp',
+        'src/WebInputEvent.cpp',
+        'src/WebInputEventConversion.cpp',
+        'src/WebInputEventConversion.h',
+        'src/WebKit.cpp',
+        'src/WebMediaPlayerClientImpl.cpp',
+        'src/WebMediaPlayerClientImpl.h',
+        'src/WebNode.cpp',
+        'src/WebNotification.cpp',
+        'src/WebPluginContainerImpl.h',
+        'src/WebPluginContainerImpl.cpp',
+        'src/WebPluginListBuilderImpl.cpp',
+        'src/WebPluginListBuilderImpl.h',
+        'src/WebPluginLoadObserver.cpp',
+        'src/WebPluginLoadObserver.h',
+        'src/WebPopupMenuImpl.cpp',
+        'src/WebPopupMenuImpl.h',
+        'src/WebRange.cpp',
+        'src/WebRuntimeFeatures.cpp',
+        'src/WebScriptController.cpp',
+        'src/WebSearchableFormData.cpp',
+        'src/WebSecurityOrigin.cpp',
+        'src/WebSecurityPolicy.cpp',
+        'src/WebSettingsImpl.cpp',
+        'src/WebSettingsImpl.h',
+        'src/WebStorageAreaImpl.cpp',
+        'src/WebStorageAreaImpl.h',
+        'src/WebStorageEventDispatcherImpl.cpp',
+        'src/WebStorageEventDispatcherImpl.h',
+        'src/WebStorageNamespaceImpl.cpp',
+        'src/WebStorageNamespaceImpl.h',
+        'src/WebString.cpp',
+        'src/WebURL.cpp',
+        'src/WebURLRequest.cpp',
+        'src/WebURLRequestPrivate.h',
+        'src/WebURLResponse.cpp',
+        'src/WebURLResponsePrivate.h',
+        'src/WebURLError.cpp',
+        'src/WebViewImpl.cpp',
+        'src/WebViewImpl.h',
+        'src/WebWorkerClientImpl.cpp',
+        'src/WebWorkerClientImpl.h',
+        'src/WebWorkerImpl.cpp',
+        'src/WebWorkerImpl.h',
+        'src/WrappedResourceRequest.h',
+        'src/WrappedResourceResponse.h',
+        'src/win/WebInputEventFactory.cpp',
+        'src/win/WebScreenInfoFactory.cpp',
+      ],
+      'conditions': [
+        ['OS=="linux" or OS=="freebsd"', {
+          'dependencies': [
+            # FIXME: correct path once upstreamed
+            '../../build/linux/system.gyp:fontconfig',
+            '../../build/linux/system.gyp:gtk',
+            '../../build/linux/system.gyp:x11',
+          ],
+          'include_dirs': [
+            'public/x11',
+            'public/gtk',
+            'public/linux',
+          ],
+        }, { # else: OS!="linux" and OS!="freebsd"
+          'sources/': [
+            ['exclude', '/gtk/'],
+            ['exclude', '/x11/'],
+            ['exclude', '/linux/'],
+          ],
+        }],
+        ['OS=="mac"', {
+          'include_dirs': [
+            'public/mac',
+          ],
+          'sources/': [
+            ['exclude', 'Skia\\.cpp$'],
+          ],
+        }, { # else: OS!="mac"
+          'sources/': [
+            ['exclude', '/mac/'],
+            ['exclude', 'CG\\.cpp$'],
+          ],
+        }],
+        ['OS=="win"', {
+          'include_dirs': [
+            'public/win',
+          ],
+        }, { # else: OS!="win"
+          'sources/': [['exclude', '/win/']],
+        }],
+        ['"ENABLE_3D_CANVAS=1" in feature_defines', {
+          # Conditionally compile in GLEW and our GraphicsContext3D implementation.
+          'sources+': [
+            'src/GraphicsContext3D.cpp',
+            # FIXME: correct path once upstreamed
+            '../../third_party/glew/src/glew.c'
+          ],
+          'include_dirs+': [
+            # FIXME: correct path once upstreamed
+            '../../third_party/glew/include'
+          ],
+          'defines+': [
+            'GLEW_STATIC=1',
+            'GLEW_NO_GLU=1',
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              'link_settings': {
+                'libraries': [
+                  '-lopengl32.lib',
+                ],
+              },
+            }],
+            ['OS=="mac"', {
+              'link_settings': {
+                'libraries': [
+                  '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
+                ],
+              },
+            }],
+          ],
+        }],
+      ],
+    },
+  ], # targets
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index d8d4625..3ce7b22 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -39,7 +39,7 @@
         '../../webkit.gyp:appcache',
         '../../webkit.gyp:database',
         '../../webkit.gyp:glue',
-        '../../webkit.gyp:webkit',
+        '../../api/WebKit.gyp:webkit',
         '../../webkit.gyp:inspector_resources',
       ],
       'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC',
@@ -116,7 +116,7 @@
         '../../../net/net.gyp:net',
         '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
         '../../webkit.gyp:glue',
-        '../../webkit.gyp:webkit',
+        '../../api/WebKit.gyp:webkit',
       ],
       'conditions': [
         # http://code.google.com/p/chromium/issues/detail?id=18337
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index d9d6e55..7304306 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -57,314 +57,6 @@
       ],
     },
     {
-      'target_name': 'webkit',
-      'type': '<(library)',
-      'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65',
-      'dependencies': [
-        '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
-      ],
-      'include_dirs': [
-        'api/public',
-        'api/src',
-      ],
-      'defines': [
-        'WEBKIT_IMPLEMENTATION',
-      ],
-      'sources': [
-        'api/public/gtk/WebInputEventFactory.h',
-        'api/public/linux/WebFontRendering.h',
-        'api/public/x11/WebScreenInfoFactory.h',
-        'api/public/mac/WebInputEventFactory.h',
-        'api/public/mac/WebScreenInfoFactory.h',
-        'api/public/WebAccessibilityController.h',
-        'api/public/WebAccessibilityObject.h',
-        'api/public/WebAccessibilityRole.h',
-        'api/public/WebApplicationCacheHost.h',
-        'api/public/WebApplicationCacheHostClient.h',
-        'api/public/WebBindings.h',
-        'api/public/WebCache.h',
-        'api/public/WebCanvas.h',
-        'api/public/WebClipboard.h',
-        'api/public/WebColor.h',
-        'api/public/WebColorName.h',
-        'api/public/WebCommon.h',
-        'api/public/WebCompositionCommand.h',
-        'api/public/WebConsoleMessage.h',
-        'api/public/WebContextMenuData.h',
-        'api/public/WebCookie.h',
-        'api/public/WebCrossOriginPreflightResultCache.h',
-        'api/public/WebCString.h',
-        'api/public/WebCursorInfo.h',
-        'api/public/WebData.h',
-        'api/public/WebDatabase.h',
-        'api/public/WebDatabaseObserver.h',
-        'api/public/WebDataSource.h',
-        'api/public/WebDevToolsAgent.h',
-        'api/public/WebDevToolsAgentClient.h',
-        'api/public/WebDevToolsFrontend.h',
-        'api/public/WebDevToolsFrontendClient.h',
-        'api/public/WebDragData.h',
-        'api/public/WebEditingAction.h',
-        'api/public/WebFileChooserCompletion.h',
-        'api/public/WebFindOptions.h',
-        'api/public/WebFrame.h',
-        'api/public/WebFrameClient.h',
-        'api/public/WebFontCache.h',
-        'api/public/WebForm.h',
-        'api/public/WebHistoryItem.h',
-        'api/public/WebHTTPBody.h',
-        'api/public/WebImage.h',
-        'api/public/WebInputEvent.h',
-        'api/public/WebKit.h',
-        'api/public/WebKitClient.h',
-        'api/public/WebLocalizedString.h',
-        'api/public/WebMediaPlayer.h',
-        'api/public/WebMediaPlayerAction.h',
-        'api/public/WebMediaPlayerClient.h',
-        'api/public/WebMessagePortChannel.h',
-        'api/public/WebMessagePortChannelClient.h',
-        'api/public/WebMimeRegistry.h',
-        'api/public/WebNavigationType.h',
-        'api/public/WebNode.h',
-        'api/public/WebNonCopyable.h',
-        'api/public/WebNotification.h',
-        'api/public/WebNotificationPresenter.h',
-        'api/public/WebNotificationPermissionCallback.h',
-        'api/public/WebPlugin.h',
-        'api/public/WebPluginContainer.h',
-        'api/public/WebPluginListBuilder.h',
-        'api/public/WebPoint.h',
-        'api/public/WebPopupMenu.h',
-        'api/public/WebPopupMenuInfo.h',
-        'api/public/WebRange.h',
-        'api/public/WebRect.h',
-        'api/public/WebRuntimeFeatures.h',
-        'api/public/WebScreenInfo.h',
-        'api/public/WebScriptController.h',
-        'api/public/WebScriptSource.h',
-        'api/public/WebSearchableFormData.h',
-        'api/public/WebSecurityOrigin.h',
-        'api/public/WebSecurityPolicy.h',
-        'api/public/WebSettings.h',
-        'api/public/WebSize.h',
-        'api/public/WebSocketStreamError.h',
-        'api/public/WebSocketStreamHandle.h',
-        'api/public/WebSocketStreamHandleClient.h',
-        'api/public/WebStorageArea.h',
-        'api/public/WebStorageEventDispatcher.h',
-        'api/public/WebStorageNamespace.h',
-        'api/public/WebString.h',
-        'api/public/WebTextAffinity.h',
-        'api/public/WebTextDirection.h',
-        'api/public/WebURL.h',
-        'api/public/WebURLError.h',
-        'api/public/WebURLLoader.h',
-        'api/public/WebURLLoaderClient.h',
-        'api/public/WebURLRequest.h',
-        'api/public/WebURLResponse.h',
-        'api/public/WebVector.h',
-        'api/public/WebView.h',
-        'api/public/WebViewClient.h',
-        'api/public/WebWidget.h',
-        'api/public/WebWidgetClient.h',
-        'api/public/WebWorker.h',
-        'api/public/WebWorkerClient.h',
-        'api/public/win/WebInputEventFactory.h',
-        'api/public/win/WebSandboxSupport.h',
-        'api/public/win/WebScreenInfoFactory.h',
-        'api/public/win/WebScreenInfoFactory.h',
-        'api/src/ApplicationCacheHost.cpp',
-        'api/src/AssertMatchingEnums.cpp',
-        'api/src/AutocompletePopupMenuClient.cpp',
-        'api/src/AutocompletePopupMenuClient.h',
-        'api/src/BackForwardListClientImpl.cpp',
-        'api/src/BackForwardListClientImpl.h',
-        'api/src/ChromeClientImpl.cpp',
-        'api/src/ChromeClientImpl.h',
-        'api/src/ChromiumBridge.cpp',
-        'api/src/ChromiumCurrentTime.cpp',
-        'api/src/ChromiumThreading.cpp',
-        'api/src/ContextMenuClientImpl.cpp',
-        'api/src/ContextMenuClientImpl.h',
-        'api/src/DOMUtilitiesPrivate.cpp',
-        'api/src/DOMUtilitiesPrivate.h',
-        'api/src/DragClientImpl.cpp',
-        'api/src/DragClientImpl.h',
-        'api/src/EditorClientImpl.cpp',
-        'api/src/EditorClientImpl.h',
-        'api/src/FrameLoaderClientImpl.cpp',
-        'api/src/FrameLoaderClientImpl.h',
-        'api/src/EmptyWebFrameClientImpl.h',
-        'api/src/gtk/WebFontInfo.cpp',
-        'api/src/gtk/WebFontInfo.h',
-        'api/src/gtk/WebInputEventFactory.cpp',
-        'api/src/InspectorClientImpl.cpp',
-        'api/src/InspectorClientImpl.h',
-        'api/src/linux/WebFontRendering.cpp',
-        'api/src/x11/WebScreenInfoFactory.cpp',
-        'api/src/mac/WebInputEventFactory.mm',
-        'api/src/mac/WebScreenInfoFactory.mm',
-        'api/src/LocalizedStrings.cpp',
-        'api/src/MediaPlayerPrivateChromium.cpp',
-        'api/src/NotificationPresenterImpl.h',
-        'api/src/NotificationPresenterImpl.cpp',
-        'api/src/PasswordAutocompleteListener.h',
-        'api/src/PlatformMessagePortChannel.cpp',
-        'api/src/PlatformMessagePortChannel.h',
-        'api/src/ResourceHandle.cpp',
-        'api/src/SharedWorkerRepository.cpp',
-        'api/src/SocketStreamHandle.cpp',
-        'api/src/StorageAreaProxy.cpp',
-        'api/src/StorageAreaProxy.h',
-        'api/src/StorageEventDispatcherChromium.cpp',
-        'api/src/StorageEventDispatcherImpl.cpp',
-        'api/src/StorageEventDispatcherImpl.h',
-        'api/src/StorageNamespaceProxy.cpp',
-        'api/src/StorageNamespaceProxy.h',
-        'api/src/TemporaryGlue.h',
-        'api/src/WebAccessibilityController.cpp',
-        'api/src/WebAccessibilityObject.cpp',
-        'api/src/WebBindings.cpp',
-        'api/src/WebCache.cpp',
-        'api/src/WebColor.cpp',
-        'api/src/WebCrossOriginPreflightResultCache.cpp',
-        'api/src/WebCString.cpp',
-        'api/src/WebCursorInfo.cpp',
-        'api/src/WebData.cpp',
-        'api/src/WebDatabase.cpp',
-        'api/src/WebDataSourceImpl.cpp',
-        'api/src/WebDataSourceImpl.h',
-        'api/src/WebDragData.cpp',
-        'api/src/WebFileChooserCompletionImpl.cpp',
-        'api/src/WebFileChooserCompletionImpl.h',
-        'api/src/WebFontCache.cpp',
-        'api/src/WebForm.cpp',
-        'api/src/WebFrameImpl.cpp',
-        'api/src/WebFrameImpl.h',
-        'api/src/WebHistoryItem.cpp',
-        'api/src/WebHTTPBody.cpp',
-        'api/src/WebImageCG.cpp',
-        'api/src/WebImageSkia.cpp',
-        'api/src/WebInputEvent.cpp',
-        'api/src/WebInputEventConversion.cpp',
-        'api/src/WebInputEventConversion.h',
-        'api/src/WebKit.cpp',
-        'api/src/WebMediaPlayerClientImpl.cpp',
-        'api/src/WebMediaPlayerClientImpl.h',
-        'api/src/WebNode.cpp',
-        'api/src/WebNotification.cpp',
-        'api/src/WebPluginContainerImpl.h',
-        'api/src/WebPluginContainerImpl.cpp',
-        'api/src/WebPluginListBuilderImpl.cpp',
-        'api/src/WebPluginListBuilderImpl.h',
-        'api/src/WebPluginLoadObserver.cpp',
-        'api/src/WebPluginLoadObserver.h',
-        'api/src/WebPopupMenuImpl.cpp',
-        'api/src/WebPopupMenuImpl.h',
-        'api/src/WebRange.cpp',
-        'api/src/WebRuntimeFeatures.cpp',
-        'api/src/WebScriptController.cpp',
-        'api/src/WebSearchableFormData.cpp',
-        'api/src/WebSecurityOrigin.cpp',
-        'api/src/WebSecurityPolicy.cpp',
-        'api/src/WebSettingsImpl.cpp',
-        'api/src/WebSettingsImpl.h',
-        'api/src/WebStorageAreaImpl.cpp',
-        'api/src/WebStorageAreaImpl.h',
-        'api/src/WebStorageEventDispatcherImpl.cpp',
-        'api/src/WebStorageEventDispatcherImpl.h',
-        'api/src/WebStorageNamespaceImpl.cpp',
-        'api/src/WebStorageNamespaceImpl.h',
-        'api/src/WebString.cpp',
-        'api/src/WebURL.cpp',
-        'api/src/WebURLRequest.cpp',
-        'api/src/WebURLRequestPrivate.h',
-        'api/src/WebURLResponse.cpp',
-        'api/src/WebURLResponsePrivate.h',
-        'api/src/WebURLError.cpp',
-        'api/src/WebViewImpl.cpp',
-        'api/src/WebViewImpl.h',
-        'api/src/WebWorkerClientImpl.cpp',
-        'api/src/WebWorkerClientImpl.h',
-        'api/src/WebWorkerImpl.cpp',
-        'api/src/WebWorkerImpl.h',
-        'api/src/WrappedResourceRequest.h',
-        'api/src/WrappedResourceResponse.h',
-        'api/src/win/WebInputEventFactory.cpp',
-        'api/src/win/WebScreenInfoFactory.cpp',
-      ],
-      'conditions': [
-        ['OS=="linux" or OS=="freebsd"', {
-          'dependencies': [
-            '../build/linux/system.gyp:fontconfig',
-            '../build/linux/system.gyp:gtk',
-            '../build/linux/system.gyp:x11',
-          ],
-          'include_dirs': [
-            'api/public/x11',
-            'api/public/gtk',
-            'api/public/linux',
-          ],
-        }, { # else: OS!="linux" and OS!="freebsd"
-          'sources/': [
-            ['exclude', '/gtk/'],
-            ['exclude', '/x11/'],
-            ['exclude', '/linux/'],
-          ],
-        }],
-        ['OS=="mac"', {
-          'include_dirs': [
-            'api/public/mac',
-          ],
-          'sources/': [
-            ['exclude', 'Skia\\.cpp$'],
-          ],
-        }, { # else: OS!="mac"
-          'sources/': [
-            ['exclude', '/mac/'],
-            ['exclude', 'CG\\.cpp$'],
-          ],
-        }],
-        ['OS=="win"', {
-          'include_dirs': [
-            'api/public/win',
-          ],
-        }, { # else: OS!="win"
-          'sources/': [['exclude', '/win/']],
-        }],
-        ['"ENABLE_3D_CANVAS=1" in feature_defines', {
-          # Conditionally compile in GLEW and our GraphicsContext3D implementation.
-          'sources+': [
-            'api/src/GraphicsContext3D.cpp',
-            '../third_party/glew/src/glew.c'
-          ],
-          'include_dirs+': [
-            '../third_party/glew/include'
-          ],
-          'defines+': [
-            'GLEW_STATIC=1',
-            'GLEW_NO_GLU=1',
-          ],
-          'conditions': [
-            ['OS=="win"', {
-              'link_settings': {
-                'libraries': [
-                  '-lopengl32.lib',
-                ],
-              },
-            }],
-            ['OS=="mac"', {
-              'link_settings': {
-                'libraries': [
-                  '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
-                ],
-              },
-            }],
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'webkit_resources',
       'type': 'none',
       'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9',
@@ -444,7 +136,7 @@
       'msvs_guid': '0B945915-31A7-4A07-A5B5-568D737A39B1',
       'dependencies': [
         '../net/net.gyp:net',
-        'webkit',
+        'api/WebKit.gyp:webkit',
       ],
       'sources': [
         # This list contains all .h and .cc in appcache except for test code.
@@ -511,7 +203,7 @@
         '../net/net.gyp:net',
         'inspector_resources',
         '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
-        'webkit',
+        'api/WebKit.gyp:webkit',
         'webkit_resources',
         'webkit_strings',
       ],