Merge WebKit at r66079 : Initial merge by git

Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7

1 files changed, 42 insertions, 12 deletions

diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index d12bee7..9443d8e 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -119,6 +119,9 @@
                 'public/WebApplicationCacheHostClient.h',
                 'public/WebAttribute.h',
                 'public/WebBindings.h',
+                'public/WebBlobData.h',
+                'public/WebBlobRegistry.h',
+                'public/WebBlobStorageData.h',
                 'public/WebCache.h',
                 'public/WebCanvas.h',
                 'public/WebClipboard.h',
@@ -134,6 +137,10 @@
                 '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',
@@ -152,12 +159,13 @@
                 'public/WebDragData.h',
                 'public/WebEditingAction.h',
                 'public/WebElement.h',
-                'public/WebEvent.h',
-                'public/WebEventListener.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/WebFindOptions.h',
                 'public/WebFloatPoint.h',
@@ -189,6 +197,8 @@
                 'public/WebIDBKey.h',
                 'public/WebIDBKeyPath.h',
                 'public/WebIDBObjectStore.h',
+                'public/WebIDBTransaction.h',
+                'public/WebIDBTransactionCallbacks.h',
                 'public/WebInputElement.h',
                 'public/WebInputEvent.h',
                 'public/WebKit.h',
@@ -203,7 +213,6 @@
                 'public/WebMessagePortChannel.h',
                 'public/WebMessagePortChannelClient.h',
                 'public/WebMimeRegistry.h',
-                'public/WebMutationEvent.h',
                 'public/WebNamedNodeMap.h',
                 'public/WebNavigationType.h',
                 'public/WebNode.h',
@@ -287,6 +296,8 @@
                 'src/AutoFillPopupMenuClient.h',
                 'src/BackForwardListClientImpl.cpp',
                 'src/BackForwardListClientImpl.h',
+                'src/BlobRegistryProxy.cpp',
+                'src/BlobRegistryProxy.h',
                 'src/BoundObject.cpp',
                 'src/BoundObject.h',
                 'src/ChromeClientImpl.cpp',
@@ -338,6 +349,10 @@
                 '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',
@@ -367,6 +382,8 @@
                 'src/StorageNamespaceProxy.cpp',
                 'src/StorageNamespaceProxy.h',
                 'src/TemporaryGlue.h',
+                'src/VideoFrameChromiumImpl.cpp',
+                'src/VideoFrameChromiumImpl.h',
                 'src/WebAccessibilityCache.cpp',
                 'src/WebAccessibilityCacheImpl.cpp',
                 'src/WebAccessibilityCacheImpl.h',
@@ -375,12 +392,20 @@
                 'src/WebAnimationControllerImpl.h',
                 'src/WebAttribute.cpp',
                 'src/WebBindings.cpp',
+                'src/WebBlobData.cpp',
+                'src/WebBlobStorageData.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',
@@ -399,12 +424,10 @@
                 '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',
@@ -438,6 +461,10 @@
                 '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',
@@ -450,7 +477,6 @@
                 'src/WebMediaElement.cpp',
                 'src/WebMediaPlayerClientImpl.cpp',
                 'src/WebMediaPlayerClientImpl.h',
-                'src/WebMutationEvent.cpp',
                 'src/WebNamedNodeMap.cpp',
                 'src/WebNode.cpp',
                 'src/WebNodeCollection.cpp',
@@ -666,7 +692,10 @@
         {
             'target_name': 'concatenated_devtools_js',
             'type': 'none',
-            'dependencies': ['devtools_html'],
+            'dependencies': [
+                'devtools_html',
+                '../../WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources'
+            ],
             'sources': ['<(PRODUCT_DIR)/resources/inspector/DevTools.js'],
             'actions': [{
                 'action_name': 'concatenate_devtools_js',
@@ -707,6 +736,7 @@
                         '<(chromium_src_dir)/base/base.gyp:base_i18n',
                         '<(chromium_src_dir)/base/base.gyp:test_support_base',
                         '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
+                        '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
                     ],
                     'include_dirs': [
                         'public',
@@ -719,16 +749,16 @@
                         'tests/KeyboardTest.cpp',
                         'tests/KURLTest.cpp',
                         'tests/RunAllTests.cpp',
-                        # FIXME: This test is compile failing on mac.
-                        # 'tests/TilingDataTest.cpp',
+                        'tests/TilingDataTest.cpp',
                     ],
                     'conditions': [
                         ['OS=="win"', {
                             'sources': [
-                                # FIXME: Port PopupMenuTest to Linux and Mac.
+                                # FIXME: Port PopupMenuTest and WebFrameTest to Linux and Mac.
                                 'tests/PopupMenuTest.cpp',
                                 'tests/TransparencyWinTest.cpp',
                                 'tests/UniscribeHelperTest.cpp',
+                                'tests/WebFrameTest.cpp',
                             ],
                         }],
                         ['OS=="mac"', {