From dcc8cf2e65d1aa555cce12431a16547e66b469ee Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 27 Apr 2010 16:31:00 +0100 Subject: Merge webkit.org at r58033 : Initial merge by git Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1 --- WebKit/chromium/WebKit.gyp | 58 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) (limited to 'WebKit/chromium/WebKit.gyp') diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp index 0c76dd3..53581bc 100644 --- a/WebKit/chromium/WebKit.gyp +++ b/WebKit/chromium/WebKit.gyp @@ -59,6 +59,12 @@ 'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65', 'dependencies': [ '../../WebCore/WebCore.gyp/WebCore.gyp:webcore', + '<(chromium_src_dir)/skia/skia.gyp:skia', + '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', + ], + 'export_dependent_settings': [ + '<(chromium_src_dir)/skia/skia.gyp:skia', + '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', ], 'include_dirs': [ 'public', @@ -68,9 +74,9 @@ 'WEBKIT_IMPLEMENTATION', ], 'sources': [ - 'public/GeolocationServiceBridgeChromium.h', 'public/gtk/WebInputEventFactory.h', 'public/linux/WebFontRendering.h', + 'public/linux/WebFontRenderStyle.h', 'public/linux/WebRenderTheme.h', 'public/x11/WebScreenInfoFactory.h', 'public/mac/WebInputEventFactory.h', @@ -119,15 +125,26 @@ 'public/WebFrame.h', 'public/WebFrameClient.h', 'public/WebFontCache.h', + 'public/WebFormControlElement.h', 'public/WebFormElement.h', + 'public/WebGeolocationService.h', + 'public/WebGeolocationServiceBridge.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/WebIDBDatabase.h', + 'public/WebIDBDatabaseError.h', + 'public/WebIndexedDatabase.h', 'public/WebInputElement.h', 'public/WebInputEvent.h', 'public/WebKit.h', 'public/WebKitClient.h', + 'public/WebLabelElement.h', 'public/WebLocalizedString.h', 'public/WebMediaPlayer.h', 'public/WebMediaPlayerAction.h', @@ -151,10 +168,13 @@ 'public/WebPasswordFormData.h', 'public/WebPlugin.h', 'public/WebPluginContainer.h', + 'public/WebPluginDocument.h', 'public/WebPluginListBuilder.h', 'public/WebPoint.h', 'public/WebPopupMenu.h', 'public/WebPopupMenuInfo.h', + 'public/WebPopupType.h', + 'public/WebPrivatePtr.h', 'public/WebRange.h', 'public/WebRect.h', 'public/WebRegularExpression.h', @@ -165,6 +185,8 @@ 'public/WebSearchableFormData.h', 'public/WebSecurityOrigin.h', 'public/WebSecurityPolicy.h', + 'public/WebSelectElement.h', + 'public/WebSerializedScriptValue.h', 'public/WebSettings.h', 'public/WebSharedWorker.h', 'public/WebSharedWorkerRepository.h', @@ -233,13 +255,21 @@ 'src/EventListenerWrapper.h', 'src/FrameLoaderClientImpl.cpp', 'src/FrameLoaderClientImpl.h', - 'src/GeolocationServiceBridgeChromium.cpp', + 'src/GLES2Context.cpp', 'src/gtk/WebFontInfo.cpp', 'src/gtk/WebFontInfo.h', 'src/gtk/WebInputEventFactory.cpp', + 'src/IDBCallbacksProxy.h', + 'src/IDBDatabaseProxy.cpp', + 'src/IDBDatabaseProxy.h', + 'src/IndexedDatabaseProxy.cpp', + 'src/IndexedDatabaseProxy.h', 'src/InspectorClientImpl.cpp', 'src/InspectorClientImpl.h', + 'src/InspectorFrontendClientImpl.cpp', + 'src/InspectorFrontendClientImpl.h', 'src/linux/WebFontRendering.cpp', + 'src/linux/WebFontRenderStyle.cpp', 'src/linux/WebRenderTheme.cpp', 'src/x11/WebScreenInfoFactory.cpp', 'src/mac/WebInputEventFactory.mm', @@ -276,6 +306,7 @@ 'src/WebBindings.cpp', 'src/WebCache.cpp', 'src/WebColor.cpp', + 'src/WebCommon.cpp', 'src/WebCrossOriginPreflightResultCache.cpp', 'src/WebCString.cpp', 'src/WebCursorInfo.cpp', @@ -299,19 +330,30 @@ 'src/WebFileChooserCompletionImpl.cpp', 'src/WebFileChooserCompletionImpl.h', 'src/WebFontCache.cpp', + 'src/WebFormControlElement.cpp', 'src/WebFormElement.cpp', 'src/WebFrameImpl.cpp', 'src/WebFrameImpl.h', + 'src/WebGeolocationServiceBridgeImpl.cpp', + 'src/WebGeolocationServiceBridgeImpl.h', 'src/WebGlyphCache.cpp', + 'src/WebGraphicsContext3D.cpp', + 'src/WebGraphicsContext3DDefaultImpl.cpp', + 'src/WebGraphicsContext3DDefaultImpl.h', 'src/WebHistoryItem.cpp', 'src/WebHTTPBody.cpp', + 'src/WebIDBDatabaseError.cpp', '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/WebMediaPlayerClientImpl.cpp', 'src/WebMediaPlayerClientImpl.h', 'src/WebMutationEvent.cpp', @@ -327,6 +369,7 @@ 'src/WebPasswordFormUtils.h', 'src/WebPluginContainerImpl.h', 'src/WebPluginContainerImpl.cpp', + 'src/WebPluginDocument.cpp', 'src/WebPluginListBuilderImpl.cpp', 'src/WebPluginListBuilderImpl.h', 'src/WebPluginLoadObserver.cpp', @@ -340,6 +383,8 @@ 'src/WebSearchableFormData.cpp', 'src/WebSecurityOrigin.cpp', 'src/WebSecurityPolicy.cpp', + 'src/WebSelectElement.cpp', + 'src/WebSerializedScriptValue.cpp', 'src/WebSettingsImpl.cpp', 'src/WebSettingsImpl.h', 'src/WebSharedWorkerImpl.cpp', @@ -457,6 +502,7 @@ 'src', ], 'sources': [ + 'tests/DragImageTest.cpp', 'tests/KeyboardTest.cpp', 'tests/KURLTest.cpp', 'tests/RunAllTests.cpp', @@ -464,10 +510,18 @@ 'conditions': [ ['OS=="win"', { 'sources': [ + # FIXME: Port PopupMenuTest to Linux and Mac. + 'tests/PopupMenuTest.cpp', 'tests/TransparencyWinTest.cpp', 'tests/UniscribeHelperTest.cpp', ], }], + ['OS=="mac"', { + 'sources!': [ + # FIXME: Port DragImageTest to Mac. + 'tests/DragImageTest.cpp', + ], + }], ], }, ], # targets -- cgit v1.1