OSDN Git Service

Merge Webkit at r70949: Initial merge by git.
[android-x86/external-webkit.git] / WebKit / chromium / WebKit.gyp
index b3a926e..f121c5f 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 Google Inc. All rights reserved.
+# Copyright (C) 2010 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
 
 {
     'includes': [
+        '../../WebCore/WebCore.gypi',
+        '../../WebKitTools/DumpRenderTree/DumpRenderTree.gypi',
+        'WebKit.gypi',
         'features.gypi',
     ],
     'variables': {
-        'webkit_target_type': 'static_library',
         'conditions': [
             # Location of the chromium src directory and target type is different
             # if webkit is built inside chromium or as standalone project.
                 # Webkit is being built outside of the full chromium project.
                 # e.g. via build-webkit --chromium
                 'chromium_src_dir': '../../WebKit/chromium',
+                'webkit_target_type': 'static_library',
+
+                # List of DevTools source files, ordered by dependencies. It is used both
+                # for copying them to resource dir, and for generating 'devtools.html' file.
+                'devtools_files': [
+                    '<@(devtools_css_files)',
+                    '<@(devtools_js_files)',
+                ],
             },{
                 # WebKit is checked out in src/chromium/third_party/WebKit
                 'chromium_src_dir': '../../../..',
-            }],
-            # We can't turn on warnings on Windows and Linux until we upstream the
-            # WebKit API.
-            ['OS=="mac"', {
-                'chromium_code': 1,
+                'webkit_target_type': '<(library)',
+
+                'devtools_files': [
+                    '<@(devtools_css_files)',
+                    '<@(devtools_js_files)',
+                ],
             }],
         ],
+        'ahem_path': '../../WebKitTools/DumpRenderTree/qt/fonts/AHEM____.TTF',
+
+        # If debug_devtools is set to 1, JavaScript files for DevTools are
+        # stored as is. Otherwise, a concatenated file is stored.
+        'debug_devtools%': 0,
     },
     'targets': [
         {
             'target_name': 'webkit',
-            'type': '<(webkit_target_type)',
             'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65',
             'dependencies': [
                 '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
+                '<(chromium_src_dir)/app/app.gyp:app_base', # For GLContext
                 '<(chromium_src_dir)/skia/skia.gyp:skia',
                 '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
+                '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl',
             ],
             'export_dependent_settings': [
                 '<(chromium_src_dir)/skia/skia.gyp:skia',
             'include_dirs': [
                 'public',
                 'src',
+                '<(chromium_src_dir)/third_party/angle/include',
             ],
             'defines': [
-                'WEBKIT_IMPLEMENTATION',
+                'WEBKIT_IMPLEMENTATION=1',
             ],
             'sources': [
                 'public/gtk/WebInputEventFactory.h',
                 'public/linux/WebFontRendering.h',
                 'public/linux/WebFontRenderStyle.h',
                 'public/linux/WebRenderTheme.h',
+                'public/linux/WebThemeEngine.h',
                 'public/x11/WebScreenInfoFactory.h',
                 'public/mac/WebInputEventFactory.h',
+                'public/mac/WebSandboxSupport.h',
                 'public/mac/WebScreenInfoFactory.h',
                 'public/WebAccessibilityCache.h',
+                'public/WebAccessibilityNotification.h',
                 'public/WebAccessibilityObject.h',
                 'public/WebAccessibilityRole.h',
                 'public/WebAnimationController.h',
                 'public/WebApplicationCacheHost.h',
                 'public/WebApplicationCacheHostClient.h',
+                'public/WebAttribute.h',
                 'public/WebBindings.h',
+                'public/WebBlobData.h',
+                'public/WebBlobRegistry.h',
                 'public/WebCache.h',
                 'public/WebCanvas.h',
                 'public/WebClipboard.h',
                 'public/WebColorName.h',
                 'public/WebCommon.h',
                 'public/WebCommonWorkerClient.h',
-                'public/WebCompositionCommand.h',
+                'public/WebCompositionUnderline.h',
                 'public/WebConsoleMessage.h',
                 'public/WebContextMenuData.h',
                 'public/WebCookie.h',
                 'public/WebCrossOriginPreflightResultCache.h',
                 'public/WebCString.h',
                 'public/WebCursorInfo.h',
+                'public/WebDOMEvent.h',
+                'public/WebDOMEventListener.h',
+                'public/WebDOMMouseEvent.h',
+                'public/WebDOMMutationEvent.h',
+                'public/WebDOMStringList.h',
                 'public/WebData.h',
                 'public/WebDatabase.h',
                 'public/WebDatabaseObserver.h',
                 'public/WebDevToolsAgentClient.h',
                 'public/WebDevToolsFrontend.h',
                 'public/WebDevToolsFrontendClient.h',
-                'public/WebDevToolsMessageData.h',
+                'public/WebDeviceOrientation.h',
+                'public/WebDeviceOrientationClient.h',
+                'public/WebDeviceOrientationClientMock.h',
+                'public/WebDeviceOrientationController.h',
                 'public/WebDocument.h',
+                'public/WebDocumentType.h',
                 'public/WebDragData.h',
                 'public/WebEditingAction.h',
                 'public/WebElement.h',
-                'public/WebEvent.h',
-                'public/WebEventListener.h',
+                'public/WebExceptionCode.h',
+                'public/WebExternalPopupMenu.h',
+                'public/WebExternalPopupMenuClient.h',
                 'public/WebFileChooserCompletion.h',
                 'public/WebFileChooserParams.h',
+                'public/WebFileError.h',
                 'public/WebFileInfo.h',
                 'public/WebFileSystem.h',
+                'public/WebFileSystemCallbacks.h',
+                'public/WebFileSystemEntry.h',
+                'public/WebFileUtilities.h',
+                'public/WebFileWriter.h',
+                'public/WebFileWriterClient.h',
                 'public/WebFindOptions.h',
+                'public/WebFloatPoint.h',
+                'public/WebFloatRect.h',
+                'public/WebFont.h',
+                'public/WebFontDescription.h',
                 'public/WebFrame.h',
                 'public/WebFrameClient.h',
                 'public/WebFontCache.h',
                 'public/WebFormElement.h',
                 'public/WebGeolocationService.h',
                 'public/WebGeolocationServiceBridge.h',
+                'public/WebGeolocationServiceMock.h',
                 'public/WebGlyphCache.h',
-                'public/WebGLES2Context.h',
                 'public/WebGraphicsContext3D.h',
                 'public/WebHistoryItem.h',
                 'public/WebHTTPBody.h',
                 'public/WebImage.h',
                 'public/WebImageDecoder.h',
                 'public/WebIDBCallbacks.h',
+                'public/WebIDBCursor.h',
                 'public/WebIDBDatabase.h',
                 'public/WebIDBDatabaseError.h',
-                'public/WebIndexedDatabase.h',
+                'public/WebIDBFactory.h',
+                'public/WebIDBKeyRange.h',
+                'public/WebIDBIndex.h',
+                'public/WebIDBKey.h',
+                'public/WebIDBKeyPath.h',
+                'public/WebIDBObjectStore.h',
+                'public/WebIDBTransaction.h',
+                'public/WebIDBTransactionCallbacks.h',
                 'public/WebInputElement.h',
                 'public/WebInputEvent.h',
                 'public/WebKit.h',
                 'public/WebKitClient.h',
                 'public/WebLabelElement.h',
                 'public/WebLocalizedString.h',
+                'public/WebMediaElement.h',
                 'public/WebMediaPlayer.h',
                 'public/WebMediaPlayerAction.h',
                 'public/WebMediaPlayerClient.h',
                 'public/WebMessagePortChannel.h',
                 'public/WebMessagePortChannelClient.h',
                 'public/WebMimeRegistry.h',
-                'public/WebMutationEvent.h',
+                'public/WebNamedNodeMap.h',
                 'public/WebNavigationType.h',
                 'public/WebNode.h',
                 'public/WebNodeCollection.h',
                 'public/WebNotification.h',
                 'public/WebNotificationPresenter.h',
                 'public/WebNotificationPermissionCallback.h',
+                'public/WebOptionElement.h',
                 'public/WebPageSerializer.h',
                 'public/WebPageSerializerClient.h',
                 'public/WebPasswordAutocompleteListener.h',
                 'public/WebPasswordFormData.h',
+                'public/WebPerformance.h',
                 'public/WebPlugin.h',
                 'public/WebPluginContainer.h',
                 'public/WebPluginDocument.h',
                 'public/WebPopupMenuInfo.h',
                 'public/WebPopupType.h',
                 'public/WebPrivatePtr.h',
+                'public/WebPrivateOwnPtr.h',
                 'public/WebRange.h',
                 'public/WebRect.h',
                 'public/WebRegularExpression.h',
+                'public/WebResourceRawHeaders.h',
                 'public/WebRuntimeFeatures.h',
+                'public/WebScrollbar.h',
+                'public/WebScrollbarClient.h',
                 'public/WebScreenInfo.h',
                 'public/WebScriptController.h',
                 'public/WebScriptSource.h',
                 'public/WebSocketStreamError.h',
                 'public/WebSocketStreamHandle.h',
                 'public/WebSocketStreamHandleClient.h',
+                'public/WebSpeechInputController.h',
+                'public/WebSpeechInputControllerMock.h',
+                'public/WebSpeechInputListener.h',
+                'public/WebSpeechInputResult.h',
                 'public/WebStorageArea.h',
                 'public/WebStorageEventDispatcher.h',
                 'public/WebStorageNamespace.h',
                 'public/WebTextAffinity.h',
                 'public/WebTextCaseSensitivity.h',
                 'public/WebTextDirection.h',
-                'public/WebThemeEngine.h',
+                'public/WebTextInputType.h',
+                'public/WebTextRun.h',
+                'public/WebThreadSafeData.h',
                 'public/WebURL.h',
                 'public/WebURLError.h',
                 'public/WebURLLoader.h',
+                'public/WebURLLoadTiming.h',
                 'public/WebURLLoaderClient.h',
                 'public/WebURLRequest.h',
                 'public/WebURLResponse.h',
                 'public/win/WebInputEventFactory.h',
                 'public/win/WebSandboxSupport.h',
                 'public/win/WebScreenInfoFactory.h',
-                'public/win/WebScreenInfoFactory.h',
-                'src/APUAgentDelegate.h',
+                'public/win/WebThemeEngine.h',
                 'src/ApplicationCacheHost.cpp',
                 'src/ApplicationCacheHostInternal.h',
                 'src/AssertMatchingEnums.cpp',
-                'src/AutocompletePopupMenuClient.cpp',
-                'src/AutocompletePopupMenuClient.h',
+                'src/AsyncFileSystemChromium.cpp',
+                'src/AsyncFileSystemChromium.h',
+                'src/AsyncFileWriterChromium.cpp',
+                'src/AsyncFileWriterChromium.h',
                 'src/AutoFillPopupMenuClient.cpp',
                 'src/AutoFillPopupMenuClient.h',
                 'src/BackForwardListClientImpl.cpp',
                 'src/BackForwardListClientImpl.h',
+                'src/BlobRegistryProxy.cpp',
+                'src/BlobRegistryProxy.h',
                 'src/BoundObject.cpp',
                 'src/BoundObject.h',
                 'src/ChromeClientImpl.cpp',
                 'src/ChromiumBridge.cpp',
                 'src/ChromiumCurrentTime.cpp',
                 'src/ChromiumThreading.cpp',
+                'src/CompositionUnderlineBuilder.h',
+                'src/CompositionUnderlineVectorBuilder.cpp',
+                'src/CompositionUnderlineVectorBuilder.h',
                 'src/ContextMenuClientImpl.cpp',
                 'src/ContextMenuClientImpl.h',
                 'src/DatabaseObserver.cpp',
-                'src/DebuggerAgent.h',
                 'src/DebuggerAgentImpl.cpp',
                 'src/DebuggerAgentImpl.h',
                 'src/DebuggerAgentManager.cpp',
                 'src/DebuggerAgentManager.h',
-                'src/DevToolsRPC.h',
-                'src/DevToolsRPCJS.h',
+                'src/DeviceOrientationClientProxy.cpp',
+                'src/DeviceOrientationClientProxy.h',
                 'src/DOMUtilitiesPrivate.cpp',
                 'src/DOMUtilitiesPrivate.h',
                 'src/DragClientImpl.cpp',
                 'src/DragClientImpl.h',
+                'src/DragScrollTimer.cpp',
+                'src/DragScrollTimer.h',
                 'src/EditorClientImpl.cpp',
                 'src/EditorClientImpl.h',
                 'src/EventListenerWrapper.cpp',
                 'src/EventListenerWrapper.h',
+                'src/ExternalPopupMenu.cpp',
+                'src/ExternalPopupMenu.h',
                 'src/FrameLoaderClientImpl.cpp',
                 'src/FrameLoaderClientImpl.h',
-                'src/GLES2Context.cpp',
+                'src/FrameNetworkingContextImpl.h',
+                'src/GraphicsContext3DChromium.cpp',
+                'src/GraphicsContext3DInternal.h',
                 'src/gtk/WebFontInfo.cpp',
                 'src/gtk/WebFontInfo.h',
                 'src/gtk/WebInputEventFactory.cpp',
+                'src/IDBCallbacksProxy.cpp',
                 'src/IDBCallbacksProxy.h',
+                'src/IDBCursorBackendProxy.cpp',
+                'src/IDBCursorBackendProxy.h',
                 'src/IDBDatabaseProxy.cpp',
                 'src/IDBDatabaseProxy.h',
-                'src/IndexedDatabaseProxy.cpp',
-                'src/IndexedDatabaseProxy.h',
+                'src/IDBFactoryBackendProxy.cpp',
+                'src/IDBFactoryBackendProxy.h',
+                'src/IDBIndexBackendProxy.cpp',
+                'src/IDBIndexBackendProxy.h',
+                'src/IDBObjectStoreProxy.cpp',
+                'src/IDBObjectStoreProxy.h',
+                'src/IDBTransactionBackendProxy.cpp',
+                'src/IDBTransactionBackendProxy.h',
+                'src/IDBTransactionCallbacksProxy.cpp',
+                'src/IDBTransactionCallbacksProxy.h',
                 'src/InspectorClientImpl.cpp',
                 'src/InspectorClientImpl.h',
                 'src/InspectorFrontendClientImpl.cpp',
                 'src/x11/WebScreenInfoFactory.cpp',
                 'src/mac/WebInputEventFactory.mm',
                 'src/mac/WebScreenInfoFactory.mm',
+                'src/LocalFileSystemChromium.cpp',
                 'src/LocalizedStrings.cpp',
                 'src/MediaPlayerPrivateChromium.cpp',
                 'src/NotificationPresenterImpl.h',
                 'src/NotificationPresenterImpl.cpp',
                 'src/PlatformMessagePortChannel.cpp',
                 'src/PlatformMessagePortChannel.h',
-                'src/ProfilerAgent.h',
-                'src/ProfilerAgentImpl.cpp',
-                'src/ProfilerAgentImpl.h',
                 'src/ResourceHandle.cpp',
                 'src/SharedWorkerRepository.cpp',
                 'src/SocketStreamHandle.cpp',
+                'src/SpeechInputClientImpl.cpp',
+                'src/SpeechInputClientImpl.h',
                 'src/StorageAreaProxy.cpp',
                 'src/StorageAreaProxy.h',
                 'src/StorageEventDispatcherChromium.cpp',
                 'src/StorageEventDispatcherImpl.h',
                 'src/StorageNamespaceProxy.cpp',
                 'src/StorageNamespaceProxy.h',
-                'src/SuggestionsPopupMenuClient.cpp',
-                'src/SuggestionsPopupMenuClient.h',
                 'src/TemporaryGlue.h',
-                'src/ToolsAgent.h',
+                'src/VideoFrameChromiumImpl.cpp',
+                'src/VideoFrameChromiumImpl.h',
                 'src/WebAccessibilityCache.cpp',
                 'src/WebAccessibilityCacheImpl.cpp',
                 'src/WebAccessibilityCacheImpl.h',
                 'src/WebAccessibilityObject.cpp',
                 'src/WebAnimationControllerImpl.cpp',
                 'src/WebAnimationControllerImpl.h',
+                'src/WebAttribute.cpp',
                 'src/WebBindings.cpp',
+                'src/WebBlobData.cpp',
                 'src/WebCache.cpp',
                 'src/WebColor.cpp',
                 'src/WebCommon.cpp',
                 'src/WebCrossOriginPreflightResultCache.cpp',
                 'src/WebCString.cpp',
                 'src/WebCursorInfo.cpp',
+                'src/WebDOMEvent.cpp',
+                'src/WebDOMEventListener.cpp',
+                'src/WebDOMEventListenerPrivate.cpp',
+                'src/WebDOMEventListenerPrivate.h',
+                'src/WebDOMMouseEvent.cpp',
+                'src/WebDOMMutationEvent.cpp',
+                'src/WebDOMStringList.cpp',
                 'src/WebData.cpp',
                 'src/WebDatabase.cpp',
                 'src/WebDataSourceImpl.cpp',
                 'src/WebDevToolsAgentImpl.h',
                 'src/WebDevToolsFrontendImpl.cpp',
                 'src/WebDevToolsFrontendImpl.h',
+                'src/WebDeviceOrientation.cpp',
+                'src/WebDeviceOrientationClientMock.cpp',
+                'src/WebDeviceOrientationController.cpp',
                 'src/WebDocument.cpp',
+                'src/WebDocumentType.cpp',
                 'src/WebDragData.cpp',
                 'src/WebElement.cpp',
                 'src/WebEntities.cpp',
                 'src/WebEntities.h',
-                'src/WebEvent.cpp',
-                'src/WebEventListener.cpp',
-                'src/WebEventListenerPrivate.cpp',
-                'src/WebEventListenerPrivate.h',
                 'src/WebFileChooserCompletionImpl.cpp',
                 'src/WebFileChooserCompletionImpl.h',
+                'src/WebFileSystemCallbacksImpl.cpp',
+                'src/WebFileSystemCallbacksImpl.h',
                 'src/WebFontCache.cpp',
+                'src/WebFontDescription.cpp',
+                'src/WebFontImpl.cpp',
+                'src/WebFontImpl.h',
                 'src/WebFormControlElement.cpp',
                 'src/WebFormElement.cpp',
                 'src/WebFrameImpl.cpp',
                 'src/WebFrameImpl.h',
                 'src/WebGeolocationServiceBridgeImpl.cpp',
                 'src/WebGeolocationServiceBridgeImpl.h',
+                'src/WebGeolocationServiceMock.cpp',
                 'src/WebGlyphCache.cpp',
                 'src/WebGraphicsContext3D.cpp',
                 'src/WebGraphicsContext3DDefaultImpl.cpp',
                 'src/WebGraphicsContext3DDefaultImpl.h',
                 'src/WebHistoryItem.cpp',
                 'src/WebHTTPBody.cpp',
+                'src/WebIDBCallbacksImpl.cpp',
+                'src/WebIDBCallbacksImpl.h',
+                'src/WebIDBCursorImpl.cpp',
+                'src/WebIDBCursorImpl.h',
                 'src/WebIDBDatabaseError.cpp',
+                'src/WebIDBDatabaseImpl.cpp',
+                'src/WebIDBDatabaseImpl.h',
+                'src/WebIDBFactory.cpp',
+                'src/WebIDBFactoryImpl.cpp',
+                'src/WebIDBFactoryImpl.h',
+                'src/WebIDBIndexImpl.cpp',
+                'src/WebIDBIndexImpl.h',
+                'src/WebIDBKey.cpp',
+                'src/WebIDBKeyPath.cpp',
+                'src/WebIDBKeyRange.cpp',
+                'src/WebIDBObjectStoreImpl.cpp',
+                'src/WebIDBObjectStoreImpl.h',
+                'src/WebIDBTransactionImpl.cpp',
+                'src/WebIDBTransactionImpl.h',
+                'src/WebIDBTransactionCallbacksImpl.cpp',
+                'src/WebIDBTransactionCallbacksImpl.h',
                 'src/WebImageCG.cpp',
                 'src/WebImageDecoder.cpp',
                 'src/WebImageSkia.cpp',
-                'src/WebIndexedDatabaseImpl.cpp',
-                'src/WebIndexedDatabaseImpl.h',
                 'src/WebInputElement.cpp',
                 'src/WebInputEvent.cpp',
                 'src/WebInputEventConversion.cpp',
                 'src/WebInputEventConversion.h',
                 'src/WebKit.cpp',
                 'src/WebLabelElement.cpp',
+                'src/WebMediaElement.cpp',
                 'src/WebMediaPlayerClientImpl.cpp',
                 'src/WebMediaPlayerClientImpl.h',
-                'src/WebMutationEvent.cpp',
+                'src/WebNamedNodeMap.cpp',
                 'src/WebNode.cpp',
                 'src/WebNodeCollection.cpp',
                 'src/WebNodeList.cpp',
                 'src/WebNotification.cpp',
+                'src/WebOptionElement.cpp',
                 'src/WebPageSerializer.cpp',
                 'src/WebPageSerializerImpl.cpp',
                 'src/WebPageSerializerImpl.h',
                 'src/WebPasswordFormData.cpp',
                 'src/WebPasswordFormUtils.cpp',
                 'src/WebPasswordFormUtils.h',
+                'src/WebPerformance.cpp',
                 'src/WebPluginContainerImpl.h',
                 'src/WebPluginContainerImpl.cpp',
                 'src/WebPluginDocument.cpp',
                 'src/WebPopupMenuImpl.h',
                 'src/WebRange.cpp',
                 'src/WebRegularExpression.cpp',
+                'src/WebResourceRawHeaders.cpp',
                 'src/WebRuntimeFeatures.cpp',
                 'src/WebScriptController.cpp',
+                'src/WebScrollbarImpl.cpp',
+                'src/WebScrollbarImpl.h',
                 'src/WebSearchableFormData.cpp',
                 'src/WebSecurityOrigin.cpp',
                 'src/WebSecurityPolicy.cpp',
                 'src/WebSettingsImpl.h',
                 'src/WebSharedWorkerImpl.cpp',
                 'src/WebSharedWorkerImpl.h',
+                'src/WebSpeechInputControllerMockImpl.cpp',
+                'src/WebSpeechInputControllerMockImpl.h',
+                'src/WebSpeechInputResult.cpp',
                 'src/WebStorageAreaImpl.cpp',
                 'src/WebStorageAreaImpl.h',
                 'src/WebStorageEventDispatcherImpl.cpp',
                 'src/WebStorageNamespaceImpl.cpp',
                 'src/WebStorageNamespaceImpl.h',
                 'src/WebString.cpp',
+                'src/WebTextRun.cpp',
+                'src/WebThreadSafeData.cpp',
                 'src/WebURL.cpp',
+                'src/WebURLLoadTiming.cpp',
                 'src/WebURLRequest.cpp',
                 'src/WebURLRequestPrivate.h',
                 'src/WebURLResponse.cpp',
                 'src/WebWorkerClientImpl.h',
                 'src/WebWorkerImpl.cpp',
                 'src/WebWorkerImpl.h',
+                'src/WorkerAsyncFileSystemChromium.cpp',
+                'src/WorkerAsyncFileSystemChromium.h',
+                'src/WorkerFileSystemCallbacksBridge.cpp',
+                'src/WorkerFileSystemCallbacksBridge.h',
                 'src/WrappedResourceRequest.h',
                 'src/WrappedResourceResponse.h',
                 'src/win/WebInputEventFactory.cpp',
                 'src/win/WebScreenInfoFactory.cpp',
             ],
             'conditions': [
+                ['inside_chromium_build==1 and OS=="win"', {
+                    'type': '<(component)',
+
+                    'conditions': [
+                        ['component=="shared_library"', {
+                            'defines': [
+                                'WEBKIT_DLL',
+                            ],
+                            'dependencies': [
+                                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_bindings',
+                                '<(chromium_src_dir)/base/base.gyp:test_support_base',
+                                '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
+                                '<(chromium_src_dir)/testing/gtest.gyp:gtest',
+                                '<(chromium_src_dir)/third_party/icu/icu.gyp:*',
+                                '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
+                                '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
+                                '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
+                                '<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
+                                '<(chromium_src_dir)/third_party/modp_b64/modp_b64.gyp:modp_b64',
+                                '<(chromium_src_dir)/third_party/nss/nss.gyp:*',
+                                '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
+                                '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib',
+                                '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+                            ],
+                            'direct_dependent_settings': {
+                                'defines': [
+                                    'WEBKIT_DLL',
+                                ],
+                            },
+                            'export_dependent_settings': [
+                                '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
+                                '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+                            ],
+                            'sources': [
+                                '<@(webkit_unittest_files)',
+                                'tests/PopupMenuTest.cpp',
+                                'tests/TransparencyWinTest.cpp',
+                                'tests/UniscribeHelperTest.cpp',
+                                'tests/WebUnitTests.cpp'
+                            ]
+                        }],
+                    ],
+                }, {
+                    'type': '<(webkit_target_type)'
+                }],
                 ['OS=="linux" or OS=="freebsd"', {
                     'dependencies': [
                         '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
                     ],
                 }, { # else: OS!="win"
                     'sources/': [['exclude', '/win/']],
+                    'variables': {
+                        # FIXME: Turn on warnings on Windows.
+                        'chromium_code': 1,
+                    }
                 }],
                 ['"ENABLE_3D_CANVAS=1" in feature_defines', {
-                    # Conditionally compile in GLEW and our GraphicsContext3D implementation.
-                    'sources+': [
-                        'src/GraphicsContext3D.cpp',
-                        '<(chromium_src_dir)/third_party/glew/src/glew.c'
-                    ],
-                    'include_dirs+': [
-                        '<(chromium_src_dir)/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': [
                         }],
                     ],
                 }],
+                ['"ENABLE_CLIENT_BASED_GEOLOCATION=1" in feature_defines', {
+                    'sources/': [
+                        ['exclude', 'WebGeolocationService.*$'],
+                        ['include', 'WebGeolocationServiceMock.*'],
+                    ],
+                }]
+            ],
+        },
+
+        {
+            'target_name': 'inspector_resources',
+            'type': 'none',
+            'dependencies': [
+                'devtools_html',
+                '../../WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources',
+            ],
+            'conditions': [
+                ['debug_devtools==0', {
+                    'dependencies': ['concatenated_devtools_js'],
+                }],
+            ],
+            'copies': [
+                {
+                    'destination': '<(PRODUCT_DIR)/resources/inspector',
+                    'files': [
+                        '<@(devtools_files)',
+                        '<@(webinspector_files)',
+                        '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js',
+                    ],
+                    'conditions': [
+                        ['debug_devtools==0', {
+                            'files/': [['exclude', '\\.js$']],
+                        }],
+                    ],
+                },
+                {
+                    'destination': '<(PRODUCT_DIR)/resources/inspector/Images',
+                    'files': [
+                        '<@(webinspector_image_files)',
+                        '<@(devtools_image_files)',
+                    ],
+               },
+            ],
+        },
+        {
+            'target_name': 'devtools_html',
+            'type': 'none',
+            'sources': ['<(PRODUCT_DIR)/resources/inspector/devtools.html'],
+            'actions': [{
+                'action_name': 'devtools_html',
+                'inputs': [
+                    '<(chromium_src_dir)/webkit/build/generate_devtools_html.py',
+                    # See issue 29695: WebKit.gypi is a source file for devtools.html.
+                    'WebKit.gypi',
+                    '../../WebCore/inspector/front-end/inspector.html',
+                ],
+                'outputs': ['<(PRODUCT_DIR)/resources/inspector/devtools.html'],
+                'action': ['python', '<@(_inputs)', '<@(_outputs)', '<@(devtools_files)'],
+            }],
+        },
+        {
+            'target_name': 'concatenated_devtools_js',
+            'type': 'none',
+            'dependencies': [
+                'devtools_html',
+                '../../WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources'
             ],
+            'sources': ['<(PRODUCT_DIR)/resources/inspector/DevTools.js'],
+            'actions': [{
+                'action_name': 'concatenate_devtools_js',
+                'script_name': '<(chromium_src_dir)/webkit/build/concatenate_js_files.py',
+                'input_page': '<(PRODUCT_DIR)/resources/inspector/devtools.html',
+                'inputs': [
+                    '<@(_script_name)',
+                    '<@(_input_page)',
+                    '<@(webinspector_files)',
+                    '<@(devtools_files)',
+                    '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js',
+                ],
+                'search_path': [
+                    '../../WebCore/inspector/front-end',
+                    'src/js',
+                    '<(SHARED_INTERMEDIATE_DIR)/webcore',
+                    '<(chromium_src_dir)/v8/tools',
+                ],
+                'outputs': ['<(PRODUCT_DIR)/resources/inspector/DevTools.js'],
+                'action': ['python', '<@(_script_name)', '<@(_input_page)', '<@(_search_path)', '<@(_outputs)'],
+            }],
         },
+
         {
             'target_name': 'webkit_unit_tests',
             'type': 'executable',
                 '<(chromium_src_dir)/testing/gtest.gyp:gtest',
                 '<(chromium_src_dir)/base/base.gyp:base',
                 '<(chromium_src_dir)/base/base.gyp:base_i18n',
+                '<(chromium_src_dir)/base/base.gyp:test_support_base',
+                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
+            ],
+            'sources': [
+                'tests/RunAllTests.cpp',
             ],
             'include_dirs': [
                 'public',
                 'src',
             ],
+            'conditions': [
+                ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
+                    'defines': [
+                        'WEBKIT_DLL_UNITTEST',
+                    ],
+                }, {
+                    'sources': [
+                        '<@(webkit_unittest_files)',
+                    ],
+                    'conditions': [
+                        ['OS=="win"', {
+                            'sources': [
+                                # FIXME: Port PopupMenuTest and WebFrameTest to Linux and Mac.
+                                'tests/PopupMenuTest.cpp',
+                                'tests/TransparencyWinTest.cpp',
+                                'tests/UniscribeHelperTest.cpp',
+                                'tests/WebFrameTest.cpp',
+                            ],
+                        }],
+                        ['OS=="mac"', {
+                            'sources!': [
+                                # FIXME: Port DragImageTest to Mac.
+                                'tests/DragImageTest.cpp',
+                            ],
+                        }],
+                        ['OS=="linux" or OS=="freebsd"', {
+                            'sources': [
+                                'tests/WebInputEventFactoryTestGtk.cpp',
+                            ],
+                            'include_dirs': [
+                                'public/gtk',
+                            ],
+                            'variables': {
+                              # FIXME: Enable warnings on other platforms.
+                              'chromium_code': 1,
+                            },
+                        }],
+                    ],
+                }],
+            ],
+        },
+        {
+            'target_name': 'ImageDiff',
+            'type': 'executable',
+            'dependencies': [
+                'webkit',
+                '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
+            ],
+            'include_dirs': [
+                '../../JavaScriptCore',
+                '<(DEPTH)',
+            ],
             'sources': [
-                'tests/DragImageTest.cpp',
-                'tests/KeyboardTest.cpp',
-                'tests/KURLTest.cpp',
-                'tests/RunAllTests.cpp',
+                '../../WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp',
+            ],
+        },
+        {
+            'target_name': 'DumpRenderTree',
+            'type': 'executable',
+            'mac_bundle': 1,
+            'dependencies': [
+                'ImageDiff',
+                'inspector_resources',
+                'webkit',
+                '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
+                '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
+                '<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa',
+                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:blob',
+                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
+            ],
+            'include_dirs': [
+                '<(chromium_src_dir)',
+                'public',
+                '../../JavaScriptCore',
+                '../../JavaScriptCore/wtf', # wtf/text/*.h refers headers in wtf/ without wtf/.
+                '<(DEPTH)',
+            ],
+            'defines': [
+                # Technically not a unit test but require functions available only to
+                # unit tests.
+                'UNIT_TEST',
+            ],
+            'sources': [
+                '<@(drt_files)',
             ],
             'conditions': [
                 ['OS=="win"', {
+                    'dependencies': ['LayoutTestHelper'],
+
+                    'resource_include_dirs': ['<(SHARED_INTERMEDIATE_DIR)/webkit'],
                     'sources': [
-                        # FIXME: Port PopupMenuTest to Linux and Mac.
-                        'tests/PopupMenuTest.cpp',
-                        'tests/TransparencyWinTest.cpp',
-                        'tests/UniscribeHelperTest.cpp',
+                        '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+                        '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
+                        '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
+                        '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
+                    ],
+                    'conditions': [
+                        ['inside_chromium_build==1 and component=="shared_library"', {
+                            'sources': [
+                                'src/ChromiumCurrentTime.cpp',
+                                'src/ChromiumThreading.cpp',
+                            ],
+                            'include_dirs': [
+                                'public',
+                            ],
+                            'dependencies': [
+                                '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+                            ],
+                        }],
+                    ],
+                    'copies': [{
+                        'destination': '<(PRODUCT_DIR)',
+                        'files': ['<(ahem_path)'],
+                    }],
+                },{ # OS!="win"
+                    'sources/': [
+                        ['exclude', 'Win\\.cpp$'],
+                    ],
+                    'dependencies': [
+                        'TestNetscapePlugIn',
                     ],
+                    'actions': [
+                        {
+                            'action_name': 'repack_locale',
+                            'variables': {
+                                'repack_path': '<(chromium_src_dir)/tools/data_pack/repack.py',
+                                'pak_inputs': [
+                                    '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+                                    '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
+                                    '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
+                                    '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
+                            ]},
+                            'inputs': [
+                                '<(repack_path)',
+                                '<@(pak_inputs)',
+                            ],
+                            'outputs': [
+                                '<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak',
+                            ],
+                            'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+                            'process_outputs_as_mac_bundle_resources': 1,
+                        },
+                    ], # actions
                 }],
                 ['OS=="mac"', {
-                    'sources!': [
-                        # FIXME: Port DragImageTest to Mac.
-                        'tests/DragImageTest.cpp',
+                    'dependencies': [
+                        'copy_mesa',
+                        'LayoutTestHelper',
                     ],
+                    'mac_bundle_resources': [
+                        '<(ahem_path)',
+                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf',
+                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher200.ttf',
+                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher300.ttf',
+                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher400.ttf',
+                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher500.ttf',
+                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher600.ttf',
+                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher700.ttf',
+                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher800.ttf',
+                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf',
+                        '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
+                    ],
+                    # Workaround for http://code.google.com/p/gyp/issues/detail?id=160
+                    'copies': [{
+                        'destination': '<(PRODUCT_DIR)/plugins/',
+                        'files': ['<(PRODUCT_DIR)/WebKitTestNetscapePlugIn.plugin/'],
+                    }],
+                },{ # OS!="mac"
+                    'sources/': [
+                        # .mm is already excluded by common.gypi
+                        ['exclude', 'Mac\\.cpp$'],
+                    ],
+                    'dependencies': [
+                        # FIXME: Switch to webkit.org's plugin.
+                        '<(chromium_src_dir)/webkit/support/webkit_support.gyp:copy_npapi_layout_test_plugin',
+                    ],
+                }],
+                ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+                    'dependencies': [
+                        '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
+                        '<(chromium_src_dir)/build/linux/system.gyp:gtk',
+                    ],
+                    'include_dirs': [
+                        'public/gtk',
+                    ],
+                    'copies': [{
+                        'destination': '<(PRODUCT_DIR)',
+                        'files': [
+                            '<(ahem_path)',
+                            '../../WebKitTools/DumpRenderTree/chromium/fonts.conf',
+                            '<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak',
+                        ]
+                    }],
+                    'variables': {
+                      # FIXME: Enable warnings on other platforms.
+                      'chromium_code': 1,
+                    },
+                },{ # OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="solaris"
+                    'sources/': [
+                        ['exclude', '(Gtk|Linux)\\.cpp$']
+                    ]
+                }],
+                ['inside_chromium_build==0', {
+                    'dependencies': [
+                        '<(chromium_src_dir)/webkit/support/setup_third_party.gyp:third_party_headers',
+                    ]
                 }],
             ],
         },
     ], # targets
+    'conditions': [
+        ['OS=="win"', {
+            'targets': [{
+                'target_name': 'LayoutTestHelper',
+                'type': 'executable',
+                'sources': ['../../WebKitTools/DumpRenderTree/chromium/LayoutTestHelperWin.cpp'],
+            }],
+        }, {  # OS!="win"
+            'targets': [
+                {
+                    'target_name': 'TestNetscapePlugIn',
+                    'type': 'loadable_module',
+                    'sources': [ '<@(test_plugin_files)' ],
+                    'dependencies': [
+                        '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
+                    ],
+                    'include_dirs': [
+                        '<(chromium_src_dir)',
+                        '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn',
+                        '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
+                    ],
+
+                    'conditions': [
+                        ['OS=="mac"', {
+                            'mac_bundle': 1,
+                            # It would be nice to name this
+                            # TestNetscapePlugIn, but that name is already
+                            # used by the fork of this plugin in Chromium.
+                            'product_name': 'WebKitTestNetscapePlugIn',
+                            'product_extension': 'plugin',
+                            'link_settings': {
+                                'libraries': [
+                                    '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+                                    '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+                                    '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+                                ]
+                            },
+                            'xcode_settings': {
+                                'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
+                                # This is a temporary fork of
+                                # DRT/TestNetscapePlugIn/mac/Info.plist.  Once
+                                # we get rid of our forked plugin in the
+                                # chromium repo, we can share the same
+                                # Info.plist.
+                                'INFOPLIST_FILE': '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist',
+                            },
+                        }],
+                        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+                            'cflags': [
+                                '-fvisibility=default',
+                            ],
+                        }],
+                    ],
+                },
+            ],
+        }],
+        ['OS=="mac"', {
+            'targets': [
+                {
+                    'target_name': 'LayoutTestHelper',
+                    'type': 'executable',
+                    'sources': ['../../WebKitTools/DumpRenderTree/chromium/LayoutTestHelper.mm'],
+                    'link_settings': {
+                        'libraries': [
+                            '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
+                        ],
+                    },
+                },
+                {
+                    'target_name': 'copy_mesa',
+                    'type': 'none',
+                    'dependencies': ['<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa'],
+                    'copies': [{
+                        'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Contents/MacOS/',
+                        'files': ['<(PRODUCT_DIR)/osmesa.so'],
+                    }],
+                },
+            ],
+        }],
+    ], # conditions
 }
 
 # Local Variables: