diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebKit/chromium/WebKit.gyp | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebKit/chromium/WebKit.gyp')
| -rw-r--r-- | WebKit/chromium/WebKit.gyp | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp index 10f01e5..eb5abbe 100644 --- a/WebKit/chromium/WebKit.gyp +++ b/WebKit/chromium/WebKit.gyp @@ -142,8 +142,10 @@ 'public/WebDevToolsAgentClient.h', 'public/WebDevToolsFrontend.h', 'public/WebDevToolsFrontendClient.h', - 'public/WebDevToolsMessageData.h', - 'public/WebDevToolsMessageTransport.h', + 'public/WebDeviceOrientation.h', + 'public/WebDeviceOrientationClient.h', + 'public/WebDeviceOrientationClientMock.h', + 'public/WebDeviceOrientationController.h', 'public/WebDocument.h', 'public/WebDocumentType.h', 'public/WebDragData.h', @@ -176,9 +178,11 @@ 'public/WebImage.h', 'public/WebImageDecoder.h', 'public/WebIDBCallbacks.h', + 'public/WebIDBCursor.h', 'public/WebIDBDatabase.h', 'public/WebIDBDatabaseError.h', 'public/WebIDBFactory.h', + 'public/WebIDBKeyRange.h', 'public/WebIDBIndex.h', 'public/WebIDBKey.h', 'public/WebIDBObjectStore.h', @@ -242,6 +246,7 @@ 'public/WebSocketStreamHandle.h', 'public/WebSocketStreamHandleClient.h', 'public/WebSpeechInputController.h', + 'public/WebSpeechInputControllerMock.h', 'public/WebSpeechInputListener.h', 'public/WebStorageArea.h', 'public/WebStorageEventDispatcher.h', @@ -271,7 +276,6 @@ 'public/win/WebSandboxSupport.h', 'public/win/WebScreenInfoFactory.h', 'public/win/WebScreenInfoFactory.h', - 'src/APUAgentDelegate.h', 'src/ApplicationCacheHost.cpp', 'src/ApplicationCacheHostInternal.h', 'src/AssertMatchingEnums.cpp', @@ -292,13 +296,12 @@ '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', @@ -319,6 +322,8 @@ 'src/gtk/WebInputEventFactory.cpp', 'src/IDBCallbacksProxy.cpp', 'src/IDBCallbacksProxy.h', + 'src/IDBCursorBackendProxy.cpp', + 'src/IDBCursorBackendProxy.h', 'src/IDBDatabaseProxy.cpp', 'src/IDBDatabaseProxy.h', 'src/IDBFactoryBackendProxy.cpp', @@ -343,9 +348,6 @@ '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', @@ -359,7 +361,6 @@ 'src/StorageNamespaceProxy.cpp', 'src/StorageNamespaceProxy.h', 'src/TemporaryGlue.h', - 'src/ToolsAgent.h', 'src/WebAccessibilityCache.cpp', 'src/WebAccessibilityCacheImpl.cpp', 'src/WebAccessibilityCacheImpl.h', @@ -383,6 +384,9 @@ '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', @@ -414,6 +418,8 @@ 'src/WebHTTPBody.cpp', 'src/WebIDBCallbacksImpl.cpp', 'src/WebIDBCallbacksImpl.h', + 'src/WebIDBCursorImpl.cpp', + 'src/WebIDBCursorImpl.h', 'src/WebIDBDatabaseError.cpp', 'src/WebIDBDatabaseImpl.cpp', 'src/WebIDBDatabaseImpl.h', @@ -422,6 +428,7 @@ 'src/WebIDBIndexImpl.cpp', 'src/WebIDBIndexImpl.h', 'src/WebIDBKey.cpp', + 'src/WebIDBKeyRange.cpp', 'src/WebIDBObjectStoreImpl.cpp', 'src/WebIDBObjectStoreImpl.h', 'src/WebImageCG.cpp', @@ -473,6 +480,8 @@ 'src/WebSettingsImpl.h', 'src/WebSharedWorkerImpl.cpp', 'src/WebSharedWorkerImpl.h', + 'src/WebSpeechInputControllerMockImpl.cpp', + 'src/WebSpeechInputControllerMockImpl.h', 'src/WebStorageAreaImpl.cpp', 'src/WebStorageAreaImpl.h', 'src/WebStorageEventDispatcherImpl.cpp', @@ -695,6 +704,7 @@ '<(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)/gpu/gpu.gyp:gles2_c_lib', ], 'include_dirs': [ |