diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/CodeGenerators.pri | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/CodeGenerators.pri')
-rw-r--r-- | Source/WebCore/CodeGenerators.pri | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Source/WebCore/CodeGenerators.pri b/Source/WebCore/CodeGenerators.pri index 2f89a5d..3d5d450 100644 --- a/Source/WebCore/CodeGenerators.pri +++ b/Source/WebCore/CodeGenerators.pri @@ -38,7 +38,7 @@ WALDOCSSPROPS = $$PWD/css/CSSPropertyNames.in WALDOCSSVALUES = $$PWD/css/CSSValueKeywords.in -DASHBOARDSUPPORTCSSPROPERTIES = $$PWD/css/DashboardSupportCSSPropertyNames.in +contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=1): DASHBOARDSUPPORTCSSPROPERTIES = $$PWD/css/DashboardSupportCSSPropertyNames.in XPATHBISON = $$PWD/xml/XPathGrammar.y @@ -62,8 +62,7 @@ STYLESHEETS_EMBED = \ $$PWD/css/mediaControls.css \ $$PWD/css/mediaControlsQt.css \ $$PWD/css/mediaControlsQtFullscreen.css \ - $$PWD/css/themeQtNoListboxes.css \ - $$PWD/css/themeQtMobile.css + $$PWD/css/themeQtNoListboxes.css v8 { IDL_BINDINGS += \ @@ -160,7 +159,6 @@ IDL_BINDINGS += \ dom/WebKitTransitionEvent.idl \ dom/WheelEvent.idl \ fileapi/Blob.idl \ - fileapi/BlobBuilder.idl \ fileapi/DirectoryEntry.idl \ fileapi/DirectoryEntrySync.idl \ fileapi/DirectoryReader.idl \ @@ -186,9 +184,10 @@ IDL_BINDINGS += \ fileapi/FileSystemCallback.idl \ fileapi/FileWriter.idl \ fileapi/FileWriterCallback.idl \ - fileapi/Flags.idl \ + fileapi/WebKitFlags.idl \ fileapi/Metadata.idl \ fileapi/MetadataCallback.idl \ + fileapi/WebKitBlobBuilder.idl \ html/canvas/ArrayBufferView.idl \ html/canvas/ArrayBuffer.idl \ html/canvas/DataView.idl \ @@ -297,6 +296,7 @@ IDL_BINDINGS += \ html/HTMLTableSectionElement.idl \ html/HTMLTextAreaElement.idl \ html/HTMLTitleElement.idl \ + html/HTMLTrackElement.idl \ html/HTMLUListElement.idl \ html/HTMLVideoElement.idl \ html/ImageData.idl \ @@ -326,6 +326,9 @@ IDL_BINDINGS += \ page/Location.idl \ page/MemoryInfo.idl \ page/Navigator.idl \ + page/NavigatorUserMediaError.idl \ + page/NavigatorUserMediaErrorCallback.idl \ + page/NavigatorUserMediaSuccessCallback.idl \ page/Performance.idl \ page/PerformanceNavigation.idl \ page/PerformanceTiming.idl \ @@ -359,6 +362,9 @@ IDL_BINDINGS += \ storage/IDBTransaction.idl \ storage/Storage.idl \ storage/StorageEvent.idl \ + storage/StorageInfo.idl \ + storage/StorageInfoErrorCallback.idl \ + storage/StorageInfoUsageCallback.idl \ storage/SQLError.idl \ storage/SQLException.idl \ storage/SQLResultSet.idl \ |