diff options
| author | Steve Block <steveblock@google.com> | 2010-02-05 14:27:46 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-15 10:49:50 +0000 |
| commit | 5e2bc6953fe6923165b8a5d7679939693a1d58d6 (patch) | |
| tree | 6ccb8c24bc2bf5e8f413e6cfae250b729b426631 /WebKit/chromium/WebKit.gyp | |
| parent | 4a00f4fccc3cb7e9996749a05631f5d7b9de756e (diff) | |
| download | external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.zip external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.tar.gz external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.tar.bz2 | |
Merge webkit.org at r54340 : Initial merge by git
Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
Diffstat (limited to 'WebKit/chromium/WebKit.gyp')
| -rw-r--r-- | WebKit/chromium/WebKit.gyp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp index 3b5a17f..4f6d3f6 100644 --- a/WebKit/chromium/WebKit.gyp +++ b/WebKit/chromium/WebKit.gyp @@ -70,6 +70,7 @@ 'sources': [ 'public/gtk/WebInputEventFactory.h', 'public/linux/WebFontRendering.h', + 'public/linux/WebRenderTheme.h', 'public/x11/WebScreenInfoFactory.h', 'public/mac/WebInputEventFactory.h', 'public/mac/WebScreenInfoFactory.h', @@ -192,6 +193,7 @@ 'public/win/WebSandboxSupport.h', 'public/win/WebScreenInfoFactory.h', 'public/win/WebScreenInfoFactory.h', + 'src/APUAgentDelegate.h', 'src/ApplicationCacheHost.cpp', 'src/ApplicationCacheHostInternal.h', 'src/AssertMatchingEnums.cpp', @@ -199,6 +201,8 @@ 'src/AutocompletePopupMenuClient.h', 'src/BackForwardListClientImpl.cpp', 'src/BackForwardListClientImpl.h', + 'src/BoundObject.cpp', + 'src/BoundObject.h', 'src/ChromeClientImpl.cpp', 'src/ChromeClientImpl.h', 'src/ChromiumBridge.cpp', @@ -207,6 +211,13 @@ '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/DOMUtilitiesPrivate.cpp', 'src/DOMUtilitiesPrivate.h', 'src/DragClientImpl.cpp', @@ -223,6 +234,7 @@ 'src/InspectorClientImpl.cpp', 'src/InspectorClientImpl.h', 'src/linux/WebFontRendering.cpp', + 'src/linux/WebRenderTheme.cpp', 'src/x11/WebScreenInfoFactory.cpp', 'src/mac/WebInputEventFactory.mm', 'src/mac/WebScreenInfoFactory.mm', @@ -232,6 +244,9 @@ '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', @@ -243,6 +258,7 @@ 'src/StorageNamespaceProxy.cpp', 'src/StorageNamespaceProxy.h', 'src/TemporaryGlue.h', + 'src/ToolsAgent.h', 'src/WebAccessibilityCache.cpp', 'src/WebAccessibilityCacheImpl.cpp', 'src/WebAccessibilityCacheImpl.h', @@ -259,6 +275,10 @@ 'src/WebDatabase.cpp', 'src/WebDataSourceImpl.cpp', 'src/WebDataSourceImpl.h', + 'src/WebDevToolsAgentImpl.cpp', + 'src/WebDevToolsAgentImpl.h', + 'src/WebDevToolsFrontendImpl.cpp', + 'src/WebDevToolsFrontendImpl.h', 'src/WebDocument.cpp', 'src/WebDragData.cpp', 'src/WebElement.cpp', |