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/DerivedSources.make | |
| 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/DerivedSources.make')
| -rw-r--r-- | Source/WebCore/DerivedSources.make | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make index c8fa310..a4c112a 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make @@ -73,12 +73,13 @@ DOM_CLASSES = \ HighPass2FilterNode \ JavaScriptAudioNode \ LowPass2FilterNode \ + OfflineAudioCompletionEvent \ RealtimeAnalyserNode \ BarInfo \ BeforeLoadEvent \ BeforeProcessEvent \ Blob \ - BlobBuilder \ + WebKitBlobBuilder \ CDATASection \ CSSCharsetRule \ CSSFontFaceRule \ @@ -196,7 +197,7 @@ DOM_CLASSES = \ FileWriterCallback \ FileWriterSync \ FileSystemCallback \ - Flags \ + WebKitFlags \ Geolocation \ Geoposition \ HashChangeEvent \ @@ -274,6 +275,7 @@ DOM_CLASSES = \ HTMLTableSectionElement \ HTMLTextAreaElement \ HTMLTitleElement \ + HTMLTrackElement \ HTMLUListElement \ HTMLVideoElement \ IDBAny \ @@ -307,6 +309,9 @@ DOM_CLASSES = \ MutationEvent \ NamedNodeMap \ Navigator \ + NavigatorUserMediaError \ + NavigatorUserMediaErrorCallback \ + NavigatorUserMediaSuccessCallback \ Node \ NodeFilter \ NodeIterator \ @@ -351,6 +356,9 @@ DOM_CLASSES = \ SQLTransactionSyncCallback \ Storage \ StorageEvent \ + StorageInfo \ + StorageInfoErrorCallback \ + StorageInfoUsageCallback \ StringCallback \ SVGAElement \ SVGAltGlyphElement \ @@ -655,12 +663,21 @@ DocTypeStrings.cpp : html/DocTypeStrings.gperf $(WebCore)/make-hash-tools.pl # -------- -# XMLViewer XSLT +# XMLViewer CSS -all : XMLViewerXSL.h +all : XMLViewerCSS.h -XMLViewerXSL.h : xml/XMLViewer.xsl - perl $(WebCore)/inspector/xxd.pl XMLViewer_xsl $(WebCore)/xml/XMLViewer.xsl XMLViewerXSL.h +XMLViewerCSS.h : xml/XMLViewer.css + perl $(WebCore)/inspector/xxd.pl XMLViewer_css $(WebCore)/xml/XMLViewer.css XMLViewerCSS.h + +# -------- + +# XMLViewer JS + +all : XMLViewerJS.h + +XMLViewerJS.h : xml/XMLViewer.js + perl $(WebCore)/inspector/xxd.pl XMLViewer_js $(WebCore)/xml/XMLViewer.js XMLViewerJS.h # -------- @@ -763,6 +780,10 @@ ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_DEFINES)), ENABLE_VIDEO) HTML_FLAGS := $(HTML_FLAGS) ENABLE_VIDEO=1 endif +ifeq ($(findstring ENABLE_VIDEO_TRACK,$(FEATURE_DEFINES)), ENABLE_VIDEO_TRACK) + HTML_FLAGS := $(HTML_FLAGS) ENABLE_VIDEO_TRACK=0 +endif + ifdef HTML_FLAGS HTMLElementFactory.cpp HTMLNames.cpp : dom/make_names.pl html/HTMLTagNames.in html/HTMLAttributeNames.in |