From 0617145a89917ae7735fe1c9538688ab9a577df5 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 30 Jul 2010 10:46:49 +0100
Subject: Merge WebKit at r64264 : Initial merge by git.

Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
---
 WebKit/chromium/WebKit.gyp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'WebKit/chromium/WebKit.gyp')

diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 8abc159..97efddc 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -116,6 +116,7 @@
                 'public/WebAnimationController.h',
                 'public/WebApplicationCacheHost.h',
                 'public/WebApplicationCacheHostClient.h',
+                'public/WebAttribute.h',
                 'public/WebBindings.h',
                 'public/WebCache.h',
                 'public/WebCanvas.h',
@@ -144,6 +145,7 @@
                 'public/WebDevToolsMessageData.h',
                 'public/WebDevToolsMessageTransport.h',
                 'public/WebDocument.h',
+                'public/WebDocumentType.h',
                 'public/WebDragData.h',
                 'public/WebEditingAction.h',
                 'public/WebElement.h',
@@ -154,6 +156,10 @@
                 'public/WebFileInfo.h',
                 'public/WebFileSystem.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',
@@ -191,6 +197,7 @@
                 'public/WebMessagePortChannelClient.h',
                 'public/WebMimeRegistry.h',
                 'public/WebMutationEvent.h',
+                'public/WebNamedNodeMap.h',
                 'public/WebNavigationType.h',
                 'public/WebNode.h',
                 'public/WebNodeCollection.h',
@@ -234,6 +241,8 @@
                 'public/WebSocketStreamError.h',
                 'public/WebSocketStreamHandle.h',
                 'public/WebSocketStreamHandleClient.h',
+                'public/WebSpeechInputController.h',
+                'public/WebSpeechInputListener.h',
                 'public/WebStorageArea.h',
                 'public/WebStorageEventDispatcher.h',
                 'public/WebStorageNamespace.h',
@@ -242,6 +251,7 @@
                 'public/WebTextCaseSensitivity.h',
                 'public/WebTextDirection.h',
                 'public/WebTextInputType.h',
+                'public/WebTextRun.h',
                 'public/WebThemeEngine.h',
                 'public/WebURL.h',
                 'public/WebURLError.h',
@@ -339,6 +349,8 @@
                 'src/ResourceHandle.cpp',
                 'src/SharedWorkerRepository.cpp',
                 'src/SocketStreamHandle.cpp',
+                'src/SpeechInputClientImpl.cpp',
+                'src/SpeechInputClientImpl.h',
                 'src/StorageAreaProxy.cpp',
                 'src/StorageAreaProxy.h',
                 'src/StorageEventDispatcherChromium.cpp',
@@ -354,6 +366,7 @@
                 'src/WebAccessibilityObject.cpp',
                 'src/WebAnimationControllerImpl.cpp',
                 'src/WebAnimationControllerImpl.h',
+                'src/WebAttribute.cpp',
                 'src/WebBindings.cpp',
                 'src/WebCache.cpp',
                 'src/WebColor.cpp',
@@ -371,6 +384,7 @@
                 'src/WebDevToolsFrontendImpl.cpp',
                 'src/WebDevToolsFrontendImpl.h',
                 'src/WebDocument.cpp',
+                'src/WebDocumentType.cpp',
                 'src/WebDragData.cpp',
                 'src/WebElement.cpp',
                 'src/WebEntities.cpp',
@@ -382,6 +396,9 @@
                 'src/WebFileChooserCompletionImpl.cpp',
                 'src/WebFileChooserCompletionImpl.h',
                 'src/WebFontCache.cpp',
+                'src/WebFontDescription.cpp',
+                'src/WebFontImpl.cpp',
+                'src/WebFontImpl.h',
                 'src/WebFormControlElement.cpp',
                 'src/WebFormElement.cpp',
                 'src/WebFrameImpl.cpp',
@@ -420,6 +437,7 @@
                 'src/WebMediaPlayerClientImpl.cpp',
                 'src/WebMediaPlayerClientImpl.h',
                 'src/WebMutationEvent.cpp',
+                'src/WebNamedNodeMap.cpp',
                 'src/WebNode.cpp',
                 'src/WebNodeCollection.cpp',
                 'src/WebNodeList.cpp',
@@ -462,6 +480,7 @@
                 'src/WebStorageNamespaceImpl.cpp',
                 'src/WebStorageNamespaceImpl.h',
                 'src/WebString.cpp',
+                'src/WebTextRun.cpp',
                 'src/WebURL.cpp',
                 'src/WebURLLoadTiming.cpp',
                 'src/WebURLRequest.cpp',
@@ -823,6 +842,11 @@
                         '../../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)/DumpRenderTree.app/Contents/PlugIns/',
+                        'files': ['<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/'],
+                    }],
                 },{ # OS!="mac"
                     'sources/': [
                         # .mm is already excluded by common.gypi
-- 
cgit v1.1