diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/CodeGenerators.pri | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/CodeGenerators.pri')
| -rw-r--r-- | Source/WebCore/CodeGenerators.pri | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/Source/WebCore/CodeGenerators.pri b/Source/WebCore/CodeGenerators.pri index d20f661..2f89a5d 100644 --- a/Source/WebCore/CodeGenerators.pri +++ b/Source/WebCore/CodeGenerators.pri @@ -109,6 +109,8 @@ IDL_BINDINGS += \ dom/Comment.idl \ dom/CompositionEvent.idl \ dom/CustomEvent.idl \ + dom/DataTransferItem.idl \ + dom/DataTransferItems.idl \ dom/DeviceMotionEvent.idl \ dom/DeviceOrientationEvent.idl \ dom/DocumentFragment.idl \ @@ -146,6 +148,7 @@ IDL_BINDINGS += \ dom/ProgressEvent.idl \ dom/RangeException.idl \ dom/Range.idl \ + dom/StringCallback.idl \ dom/Text.idl \ dom/TextEvent.idl \ dom/Touch.idl \ @@ -331,6 +334,8 @@ IDL_BINDINGS += \ page/SpeechInputEvent.idl \ page/SpeechInputResult.idl \ page/SpeechInputResultList.idl \ + page/WebKitAnimation.idl \ + page/WebKitAnimationList.idl \ page/WebKitPoint.idl \ page/WorkerNavigator.idl \ plugins/DOMPlugin.idl \ @@ -542,7 +547,8 @@ IDL_BINDINGS += \ xml/XSLTProcessor.idl -INSPECTOR_INTERFACES = inspector/Inspector.idl +INSPECTOR_JSON = inspector/Inspector.json +INSPECTOR_IDL = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl INSPECTOR_BACKEND_STUB_QRC = inspector/front-end/InspectorBackendStub.qrc INJECTED_SCRIPT_SOURCE = $$PWD/inspector/InjectedScriptSource.js @@ -640,18 +646,27 @@ v8 { addExtraCompiler(idl) # GENERATOR 2: inspector idl compiler +inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl +inspectorJSON.input = INSPECTOR_JSON +inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl +inspectorJSON.commands = python $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json +inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl +inspectorJSON.wkAddOutputToSources = false +addExtraCompiler(inspectorJSON) + inspectorIDL.output = $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}Frontend.cpp $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}BackendDispatcher.cpp -inspectorIDL.input = INSPECTOR_INTERFACES +inspectorIDL.input = INSPECTOR_IDL inspectorIDL.wkScript = $$PWD/bindings/scripts/generate-bindings.pl inspectorIDL.commands = perl -I$$PWD/bindings/scripts -I$$PWD/inspector $$inspectorIDL.wkScript --defines \"$${FEATURE_DEFINES_JAVASCRIPT}\" --generator Inspector --outputDir $$WC_GENERATED_SOURCES_DIR --preprocessor \"$${QMAKE_MOC} -E\" ${QMAKE_FILE_NAME} inspectorIDL.depends = $$PWD/bindings/scripts/CodeGenerator.pm \ $$PWD/inspector/CodeGeneratorInspector.pm \ $$PWD/bindings/scripts/IDLParser.pm \ $$PWD/bindings/scripts/IDLStructure.pm \ - $$PWD/bindings/scripts/InFilesParser.pm + $$PWD/bindings/scripts/InFilesParser.pm \ + $$PWD/inspector/Inspector.json \ + $$PWD/inspector/generate-inspector-idl addExtraCompiler(inspectorIDL) -inspectorBackendStub.wkAddOutputToSources = false inspectorBackendStub.output = generated/InspectorBackendStub.qrc inspectorBackendStub.input = INSPECTOR_BACKEND_STUB_QRC inspectorBackendStub.tempNames = $$PWD/$$INSPECTOR_BACKEND_STUB_QRC $${WC_GENERATED_SOURCES_DIR}/InspectorBackendStub.qrc |