Skip to content

GitLab

T
tangled
Commit 478d6584 authored by mark@chromium.org's avatar mark@chromium.org
Browse files
Options

Catch webkit.gyp up to Chromium r10396 WebKit r41217. 

Review URL: http://codereview.chromium.org/27195

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10448 0039d316-1c4b-4281-b951-d872f2087c98
parent 8213147d
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 20 deletions
webkit/webkit.gyp
View file @ 478d6584
......@@ -62,6 +62,7 @@
'../third_party/WebKit/WebCore/svg',
'../third_party/WebKit/WebCore/svg/animation',
'../third_party/WebKit/WebCore/svg/graphics',
'../third_party/WebKit/WebCore/workers',
'../third_party/WebKit/WebCore/xml',
],
'conditions': [
......@@ -676,9 +677,6 @@
'../third_party/WebKit/WebCore/dom/WebKitAnimationEvent.idl',
'../third_party/WebKit/WebCore/dom/WebKitTransitionEvent.idl',
'../third_party/WebKit/WebCore/dom/WheelEvent.idl',
'../third_party/WebKit/WebCore/dom/Worker.idl',
'../third_party/WebKit/WebCore/dom/WorkerContext.idl',
'../third_party/WebKit/WebCore/dom/WorkerLocation.idl',
'../third_party/WebKit/WebCore/html/CanvasGradient.idl',
'../third_party/WebKit/WebCore/html/CanvasPattern.idl',
'../third_party/WebKit/WebCore/html/CanvasPixelArray.idl',
......@@ -958,6 +956,7 @@
'../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.h',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomVoidCallback.h',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8DOMParserConstructor.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8DatabaseCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLCollectionCustom.cpp',
......@@ -967,6 +966,7 @@
'../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.h',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8MessageChannelConstructor.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8NamedNodesCollection.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8NamedNodesCollection.h',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8SQLResultSetRowListCustom.cpp',
......@@ -974,6 +974,10 @@
'../third_party/WebKit/WebCore/bindings/v8/custom/V8SVGElementInstanceCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8SVGLengthCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8SVGMatrixCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8XMLSerializerConstructor.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8XPathEvaluatorConstructor.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8XSLTProcessorCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/ScriptCachedFrameData.h',
'../third_party/WebKit/WebCore/bindings/v8/ScriptCallFrame.cpp',
'../third_party/WebKit/WebCore/bindings/v8/ScriptCallFrame.h',
......@@ -1222,8 +1226,6 @@
'../third_party/WebKit/WebCore/dom/ContainerNode.cpp',
'../third_party/WebKit/WebCore/dom/ContainerNode.h',
'../third_party/WebKit/WebCore/dom/ContainerNodeAlgorithms.h',
'../third_party/WebKit/WebCore/dom/CrossThreadCopier.cpp',
'../third_party/WebKit/WebCore/dom/CrossThreadCopier.h',
'../third_party/WebKit/WebCore/dom/DOMCoreException.h',
'../third_party/WebKit/WebCore/dom/DOMImplementation.cpp',
'../third_party/WebKit/WebCore/dom/DOMImplementation.h',
......@@ -1264,7 +1266,6 @@
'../third_party/WebKit/WebCore/dom/FormControlElement.h',
'../third_party/WebKit/WebCore/dom/FormControlElementWithState.cpp',
'../third_party/WebKit/WebCore/dom/FormControlElementWithState.h',
'../third_party/WebKit/WebCore/dom/GenericWorkerTask.h',
'../third_party/WebKit/WebCore/dom/InputElement.cpp',
'../third_party/WebKit/WebCore/dom/InputElement.h',
'../third_party/WebKit/WebCore/dom/KeyboardEvent.cpp',
......@@ -1362,20 +1363,6 @@
'../third_party/WebKit/WebCore/dom/WebKitTransitionEvent.h',
'../third_party/WebKit/WebCore/dom/WheelEvent.cpp',
'../third_party/WebKit/WebCore/dom/WheelEvent.h',
'../third_party/WebKit/WebCore/dom/Worker.cpp',
'../third_party/WebKit/WebCore/dom/Worker.h',
'../third_party/WebKit/WebCore/dom/WorkerContext.cpp',
'../third_party/WebKit/WebCore/dom/WorkerContext.h',
'../third_party/WebKit/WebCore/dom/WorkerContextProxy.h',
'../third_party/WebKit/WebCore/dom/WorkerLocation.cpp',
'../third_party/WebKit/WebCore/dom/WorkerLocation.h',
'../third_party/WebKit/WebCore/dom/WorkerMessagingProxy.cpp',
'../third_party/WebKit/WebCore/dom/WorkerMessagingProxy.h',
'../third_party/WebKit/WebCore/dom/WorkerObjectProxy.h',
'../third_party/WebKit/WebCore/dom/WorkerRunLoop.cpp',
'../third_party/WebKit/WebCore/dom/WorkerRunLoop.h',
'../third_party/WebKit/WebCore/dom/WorkerThread.cpp',
'../third_party/WebKit/WebCore/dom/WorkerThread.h',
'../third_party/WebKit/WebCore/dom/XMLTokenizer.cpp',
'../third_party/WebKit/WebCore/dom/XMLTokenizer.h',
'../third_party/WebKit/WebCore/dom/XMLTokenizerLibxml2.cpp',
......@@ -2832,6 +2819,8 @@
'../third_party/WebKit/WebCore/platform/ContextMenu.h',
'../third_party/WebKit/WebCore/platform/ContextMenuItem.h',
'../third_party/WebKit/WebCore/platform/CookieJar.h',
'../third_party/WebKit/WebCore/platform/CrossThreadCopier.h',
'../third_party/WebKit/WebCore/platform/CrossThreadCopier.cpp',
'../third_party/WebKit/WebCore/platform/Cursor.h',
'../third_party/WebKit/WebCore/platform/DeprecatedPtrList.h',
'../third_party/WebKit/WebCore/platform/DeprecatedPtrListImpl.cpp',
......@@ -3646,6 +3635,24 @@
'../third_party/WebKit/WebCore/svg/SVGZoomEvent.cpp',
'../third_party/WebKit/WebCore/svg/SVGZoomEvent.h',
'../third_party/WebKit/WebCore/svg/SynchronizableTypeWrapper.h',
'../third_party/WebKit/WebCore/workers/GenericWorkerTask.h',
'../third_party/WebKit/WebCore/workers/Worker.cpp',
'../third_party/WebKit/WebCore/workers/Worker.h',
'../third_party/WebKit/WebCore/workers/Worker.idl',
'../third_party/WebKit/WebCore/workers/WorkerContext.cpp',
'../third_party/WebKit/WebCore/workers/WorkerContext.h',
'../third_party/WebKit/WebCore/workers/WorkerContext.idl',
'../third_party/WebKit/WebCore/workers/WorkerContextProxy.h',
'../third_party/WebKit/WebCore/workers/WorkerLocation.cpp',
'../third_party/WebKit/WebCore/workers/WorkerLocation.h',
'../third_party/WebKit/WebCore/workers/WorkerLocation.idl',
'../third_party/WebKit/WebCore/workers/WorkerMessagingProxy.cpp',
'../third_party/WebKit/WebCore/workers/WorkerMessagingProxy.h',
'../third_party/WebKit/WebCore/workers/WorkerObjectProxy.h',
'../third_party/WebKit/WebCore/workers/WorkerRunLoop.cpp',
'../third_party/WebKit/WebCore/workers/WorkerRunLoop.h',
'../third_party/WebKit/WebCore/workers/WorkerThread.cpp',
'../third_party/WebKit/WebCore/workers/WorkerThread.h',
'../third_party/WebKit/WebCore/xml/DOMParser.cpp',
'../third_party/WebKit/WebCore/xml/DOMParser.h',
'../third_party/WebKit/WebCore/xml/NativeXPathNSResolver.cpp',
......@@ -3784,6 +3791,10 @@
# Someone (me?) should figure it out and add appropriate comments.
'../third_party/WebKit/WebCore/css/CSSUnknownRule.idl',
# Not ready to build yet.
# TODO(mark): Remove when ready.
'../third_party/WebKit/WebCore/bindings/v8/custom/V8XSLTProcessorCustom.cpp',
# Don't build custom bindings for VoidCallback.
'../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment