Changeset 167632 in webkit

Timestamp:

Apr 21, 2014, 4:18:23 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] implement WebKitDataCue
​https://bugs.webkit.org/show_bug.cgi?id=131799

Reviewed by Dean Jackson.

Source/JavaScriptCore:

• Configurations/FeatureDefines.xcconfig: Define ENABLE_DATACUE_VALUE.

Source/WebCore:
Tests: http/tests/media/track-in-band-hls-metadata.html

media/track/track-datacue-value.html

• Configurations/FeatureDefines.xcconfig: Define ENABLE_DATACUE_VALUE.
• DerivedSources.make: Add ENABLE_DATACUE_VALUE to HTML_FLAGS when appropriate.

• CMakeLists.txt: Add JSDataCueCustom.cpp.
• bindings/js/JSBindingsAllInOne.cpp:
• WebCore.xcodeproj/project.pbxproj: Add new files.

• bindings/js/JSDataCueCustom.cpp: Added.

(WebCore::JSDataCue::value):
(WebCore::JSDataCue::setValue):
(WebCore::JSDataCueConstructor::constructJSDataCue): Custom constructor.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::updateActiveTextTrackCues): Drive-by fixes: don't schedule timeupdate

events when paused, don't call sort on an Vector that can't be sorted.

• html/track/DataCue.cpp:

(WebCore::DataCue::DataCue): Initialize m_type.
(WebCore::DataCue::~DataCue): Unprotect the JSValue if necessary.
(WebCore::DataCue::data): Ask the platform value for data if non-null.
(WebCore::DataCue::setData): Clear m_platformValue and m_value.
(WebCore::DataCue::isEqual): New.
(WebCore::DataCue::value): Return a JSValue from the platform value, or the value passed

to the constructor/set by script.

(WebCore::DataCue::setValue): Set m_value.

• html/track/DataCue.h:
• html/track/DataCue.idl:

• html/track/InbandDataTextTrack.cpp:

(WebCore::InbandDataTextTrack::addDataCue): Don't add the same cue more than once.
(WebCore::InbandDataTextTrack::updateDataCue): Update a cue's duration.
(WebCore::InbandDataTextTrack::removeDataCue): Remove an incomplete cue.
(WebCore::InbandDataTextTrack::removeCue): Remove a cue from the incomplete cue map if necessary.

• html/track/InbandDataTextTrack.h:

• html/track/InbandGenericTextTrack.cpp:

(WebCore::InbandGenericTextTrack::addGenericCue): CueMatchRules is now in TextTrackCue instead

of VTTCue.

• html/track/InbandTextTrack.h:

• html/track/InbandWebVTTTextTrack.cpp:

(WebCore::InbandWebVTTTextTrack::newCuesParsed): Ditto.

• html/track/TextTrack.cpp:

(WebCore::TextTrack::hasCue): Ditto.

• html/track/TextTrack.h:

• html/track/TextTrackCue.cpp:

(WebCore::TextTrackCue::isEqual): New, test base class equality.

• html/track/TextTrackCue.h:

• html/track/TextTrackCueGeneric.cpp:

(WebCore::TextTrackCueGeneric::isEqual): Call TextTrackCue::isEqual first.

• html/track/TextTrackCueGeneric.h:

• html/track/VTTCue.cpp:

(WebCore::VTTCue::isEqual): Call TextTrackCue::isEqual first.

• html/track/VTTCue.h:

• platform/SerializedPlatformRepresentation.h: Added.

(WebCore::SerializedPlatformRepresentation::~SerializedPlatformRepresentation):
(WebCore::SerializedPlatformRepresentation::SerializedPlatformRepresentation):

• platform/graphics/InbandTextTrackPrivateClient.h: Add methods for DataCue with SerializedPlatformRepresentation.

• platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp: Added.

(WebCore::InbandMetadataTextTrackPrivateAVF::create):
(WebCore::InbandMetadataTextTrackPrivateAVF::InbandMetadataTextTrackPrivateAVF):
(WebCore::InbandMetadataTextTrackPrivateAVF::~InbandMetadataTextTrackPrivateAVF):
(WebCore::InbandMetadataTextTrackPrivateAVF::addDataCue):
(WebCore::InbandMetadataTextTrackPrivateAVF::updatePendingCueEndTimes):
(WebCore::InbandMetadataTextTrackPrivateAVF::flushPartialCues):

• platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h: Added.

• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:

(WebCore::MediaPlayerPrivateAVFoundation::seekWithTolerance): currentTrack -> currentTextTrack.
(WebCore::MediaPlayerPrivateAVFoundation::seekCompleted): Ditto.
(WebCore::MediaPlayerPrivateAVFoundation::configureInbandTracks): Ditto.

• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:

(WebCore::MediaPlayerPrivateAVFoundation::setCurrentTextTrack):
(WebCore::MediaPlayerPrivateAVFoundation::setCurrentTrack): Deleted.

Renamed currentTrack and setCurrentTrack to currentTextTrack and setCurrentTextTrack.

• platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:

(WebCore::AVFWrapper::currentTextTrack):
(WebCore::MediaPlayerPrivateAVFoundationCF::setCurrentTextTrack):
(WebCore::MediaPlayerPrivateAVFoundationCF::currentTextTrack):
(WebCore::AVFWrapper::setCurrentTextTrack):
(WebCore::AVFWrapper::AVFWrapper):
(WebCore::AVFWrapper::processCue):
(WebCore::AVFWrapper::currentTrack): Deleted.
(WebCore::MediaPlayerPrivateAVFoundationCF::setCurrentTrack): Deleted.
(WebCore::MediaPlayerPrivateAVFoundationCF::currentTrack): Deleted.
(WebCore::AVFWrapper::setCurrentTrack): Deleted.

• platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:

• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC):
(WebCore::MediaPlayerPrivateAVFoundationObjC::seekToTime): currentTrack -> currentTextTrack
(WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged): currentTrack -> currentTextTrack.
(WebCore::MediaPlayerPrivateAVFoundationObjC::processMetadataTrack): New.
(WebCore::MediaPlayerPrivateAVFoundationObjC::processCue): m_currentTrack -> m_currentTextTrack.
(WebCore::MediaPlayerPrivateAVFoundationObjC::flushCues): Ditto.
(WebCore::MediaPlayerPrivateAVFoundationObjC::setCurrentTextTrack): Renamed from setCurrentTextTrack.
(WebCore::metadataType): Map an AVFoundation metadata key space to a metadata cue type.
(WebCore::MediaPlayerPrivateAVFoundationObjC::metadataDidArrive): Process new metadata.
(-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setCurrentTrack): Deleted.

Create a JSValue representation from an AVMetadataItem.

• platform/mac/SerializedPlatformRepresentationMac.h: Added.

(WebCore::SerializedPlatformRepresentationMac::platformType):
(WebCore::SerializedPlatformRepresentationMac::nativeValue):

• platform/mac/SerializedPlatformRepresentationMac.mm: Added.

(WebCore::SerializedPlatformRepresentationMac::SerializedPlatformRepresentationMac):
(WebCore::SerializedPlatformRepresentationMac::~SerializedPlatformRepresentationMac):
(WebCore::SerializedPlatformRepresentationMac::create):
(WebCore::SerializedPlatformRepresentationMac::data):
(WebCore::SerializedPlatformRepresentationMac::deserialize):
(WebCore::SerializedPlatformRepresentationMac::isEqual):
(WebCore::toSerializedPlatformRepresentationMac):
(WebCore::jsValueWithValueInContext):
(WebCore::jsValueWithDataInContext):
(WebCore::jsValueWithArrayInContext):
(WebCore::jsValueWithDictionaryInContext):
(WebCore::jsValueWithAVMetadataItemInContext):

Source/WebKit/mac:

• Configurations/FeatureDefines.xcconfig: Define ENABLE_DATACUE_VALUE.

Source/WebKit2:

• Configurations/FeatureDefines.xcconfig: Define ENABLE_DATACUE_VALUE.

Source/WTF:

• wtf/FeatureDefines.h: Define ENABLE_DATACUE_VALUE.

LayoutTests:

• http/tests/media/resources/hls: Added.
• http/tests/media/resources/hls/metadata: Added.
• http/tests/media/resources/hls/metadata/fileSequence0.ts: Added.
• http/tests/media/resources/hls/metadata/fileSequence1.ts: Added.
• http/tests/media/resources/hls/metadata/fileSequence2.ts: Added.
• http/tests/media/resources/hls/metadata/fileSequence3.ts: Added.
• http/tests/media/resources/hls/metadata/prog_index.m3u8: Added.
• http/tests/media/track-in-band-hls-metadata-expected.txt: Added.
• http/tests/media/track-in-band-hls-metadata.html: Added.
• media/track/track-datacue-value-expected.txt: Added.
• media/track/track-datacue-value.html: Added.
• platform/efl/TestExpectations: Skip the new tests.
• platform/gtk/TestExpectations: Ditto.
• platform/mac/js/dom/global-constructors-attributes-expected.txt: Update.
• platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt: Update.
• platform/mac/TestExpectations: Skip DataCue test on all Mac versions. Skip HLS test on

Mountain Lion.

• platform/win/TestExpectations: Skip the new tests.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/media/resources/hls (added)
• LayoutTests/http/tests/media/resources/hls/metadata (added)
• LayoutTests/http/tests/media/resources/hls/metadata/fileSequence0.ts (added)
• LayoutTests/http/tests/media/resources/hls/metadata/fileSequence1.ts (added)
• LayoutTests/http/tests/media/resources/hls/metadata/fileSequence2.ts (added)
• LayoutTests/http/tests/media/resources/hls/metadata/fileSequence3.ts (added)
• LayoutTests/http/tests/media/resources/hls/metadata/prog_index.m3u8 (added)
• LayoutTests/http/tests/media/track-in-band-hls-metadata-expected.txt (added)
• LayoutTests/http/tests/media/track-in-band-hls-metadata.html (added)
• LayoutTests/media/track/track-datacue-value-expected.txt (added)
• LayoutTests/media/track/track-datacue-value.html (added)
• LayoutTests/platform/efl/TestExpectations (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt (modified) (2 diffs)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (modified) (2 diffs)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/FeatureDefines.h (modified) (1 diff)
• Source/WebCore/CMakeLists.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
• Source/WebCore/DerivedSources.make (modified) (1 diff)
• Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (14 diffs)
• Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (modified) (1 diff)
• Source/WebCore/bindings/js/JSDataCueCustom.cpp (added)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)
• Source/WebCore/html/track/DataCue.cpp (modified) (6 diffs)
• Source/WebCore/html/track/DataCue.h (modified) (4 diffs)
• Source/WebCore/html/track/DataCue.idl (modified) (2 diffs)
• Source/WebCore/html/track/InbandDataTextTrack.cpp (modified) (3 diffs)
• Source/WebCore/html/track/InbandDataTextTrack.h (modified) (3 diffs)
• Source/WebCore/html/track/InbandGenericTextTrack.cpp (modified) (1 diff)
• Source/WebCore/html/track/InbandTextTrack.h (modified) (1 diff)
• Source/WebCore/html/track/InbandWebVTTTextTrack.cpp (modified) (1 diff)
• Source/WebCore/html/track/TextTrack.cpp (modified) (3 diffs)
• Source/WebCore/html/track/TextTrack.h (modified) (1 diff)
• Source/WebCore/html/track/TextTrackCue.cpp (modified) (1 diff)
• Source/WebCore/html/track/TextTrackCue.h (modified) (1 diff)
• Source/WebCore/html/track/TextTrackCueGeneric.cpp (modified) (1 diff)
• Source/WebCore/html/track/TextTrackCueGeneric.h (modified) (1 diff)
• Source/WebCore/html/track/VTTCue.cpp (modified) (1 diff)
• Source/WebCore/html/track/VTTCue.h (modified) (1 diff)
• Source/WebCore/platform/SerializedPlatformRepresentation.h (added)
• Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h (modified) (3 diffs)
• Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp (added)
• Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h (added)
• Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (modified) (3 diffs)
• Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (modified) (3 diffs)
• Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (modified) (6 diffs)
• Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h (modified) (1 diff)
• Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (modified) (4 diffs)
• Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (15 diffs)
• Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.h (added)
• Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm (added)
• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-21  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] implement WebKitDataCue
+        https://bugs.webkit.org/show_bug.cgi?id=131799
+
+        Reviewed by Dean Jackson.
+
+        * http/tests/media/resources/hls: Added.
+        * http/tests/media/resources/hls/metadata: Added.
+        * http/tests/media/resources/hls/metadata/fileSequence0.ts: Added.
+        * http/tests/media/resources/hls/metadata/fileSequence1.ts: Added.
+        * http/tests/media/resources/hls/metadata/fileSequence2.ts: Added.
+        * http/tests/media/resources/hls/metadata/fileSequence3.ts: Added.
+        * http/tests/media/resources/hls/metadata/prog_index.m3u8: Added.
+        * http/tests/media/track-in-band-hls-metadata-expected.txt: Added.
+        * http/tests/media/track-in-band-hls-metadata.html: Added.
+        * media/track/track-datacue-value-expected.txt: Added.
+        * media/track/track-datacue-value.html: Added.
+        * platform/efl/TestExpectations: Skip the new tests.
+        * platform/gtk/TestExpectations: Ditto.
+        * platform/mac/js/dom/global-constructors-attributes-expected.txt: Update.
+        * platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt: Update.
+        * platform/mac/TestExpectations: Skip DataCue test on all Mac versions. Skip HLS test on 
+            Mountain Lion.
+        * platform/win/TestExpectations: Skip the new tests.
+
 2014-04-21  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/LayoutTests/platform/efl/TestExpectations

@@ -1399 +1399 @@
 Bug(EFL) media/track/in-band [ Skip ]
 
+# DataCue.value not enabled
+Bug(EFL) http/tests/media/track-in-band-hls-metadata.html [ Skip ]
+Bug(EFL) media/track/track-datacue-value.html [ Skip ]
+
 # Rendering failure, also missing expected results:
 webkit.org/b/105093 compositing/webgl/webgl-nonpremultiplied-blend.html [ Skip ]

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -339 +339 @@
 webkit.org/b/131546 media/track/track-in-band-legacy-api.html [ Failure ]
 webkit.org/b/131546 media/track/track-in-band-mode.html [ Skip ]
+
+# DataCue.value not enabled
+Bug(GTK) http/tests/media/track-in-band-hls-metadata.html [ Skip ]
+Bug(GTK) media/track/track-datacue-value.html [ Skip ]
 
 # Require ENABLE(CUSTOM_ELEMENTS) support

trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt

@@ -254 +254 @@
 PASS Object.getOwnPropertyDescriptor(global, 'DOMTokenList').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'DOMTokenList').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'DataCue').value is DataCue
-PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer
 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false
@@ -1939 +1934 @@
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSTransformValue').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSTransformValue').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').value is WebKitDataCue
+PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMutationObserver').value is WebKitMutationObserver
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMutationObserver').hasOwnProperty('get') is false

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1341 +1341 @@
 webkit.org/b/130693 mathml/presentation/tokenElements-background-color.html [ ImageOnlyFailure ]
 
+# WebKitDataCue is supported, not DataCue
+media/track/track-datacue.html [ Skip ]
+
+# Mountain Lion and prior do not support HLS timed metadata
+Bug(ericcarlson) [ MountainLion ] http/tests/media/track-in-band-hls-metadata.html [ Skip ]
+
 # Frequently times out on EWS, which is then misreported as crash.
 webkit.org/b/130720 [ MountainLion Release ] media/W3C/audio/canPlayType/canPlayType_application_octet_stream.html [ Pass Failure Crash Timeout ]

trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt

@@ -254 +254 @@
 PASS Object.getOwnPropertyDescriptor(global, 'DOMTokenList').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'DOMTokenList').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'DataCue').value is DataCue
-PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer
 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false
@@ -1949 +1944 @@
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSTransformValue').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSTransformValue').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').value is WebKitDataCue
+PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyError').value is WebKitMediaKeyError
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyError').hasOwnProperty('get') is false

trunk/LayoutTests/platform/win/TestExpectations

@@ -2732 +2732 @@
 platform/win/plugins/iframe-inside-overflow.html [ Failure ]
 
+# DataCue.value not enabled
+http/tests/media/track-in-band-hls-metadata.html [ Skip ]
+media/track/track-datacue-value.html [ Skip ]
+
 # CRASHES
 ietestcenter/Javascript/15.2.3.3-4-18.html [ Crash ]

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-04-21  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] implement WebKitDataCue
+        https://bugs.webkit.org/show_bug.cgi?id=131799
+
+        Reviewed by Dean Jackson.
+
+        * Configurations/FeatureDefines.xcconfig: Define ENABLE_DATACUE_VALUE.
+
 2014-04-21  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

@@ -210 +210 @@
 ENABLE_VIDEO = ENABLE_VIDEO;
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
+ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
 ENABLE_VIEW_MODE_CSS_MEDIA = ;
 ENABLE_WEBGL = ENABLE_WEBGL;
@@ -244 +245 @@
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-04-21  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] implement WebKitDataCue
+        https://bugs.webkit.org/show_bug.cgi?id=131799
+
+        Reviewed by Dean Jackson.
+
+        * wtf/FeatureDefines.h: Define ENABLE_DATACUE_VALUE.
+
 2014-04-21  Darin Adler  <darin@apple.com>
 

trunk/Source/WTF/wtf/FeatureDefines.h

@@ -761 +761 @@
 #endif
 
+#if !defined(ENABLE_DATACUE_VALUE)
+#define ENABLE_DATACUE_VALUE 0
+#endif
+
 #if !defined(ENABLE_VIEWPORT)
 #define ENABLE_VIEWPORT 0

trunk/Source/WebCore/CMakeLists.txt

@@ -1026 +1026 @@
     bindings/js/JSCanvasRenderingContext2DCustom.cpp
     bindings/js/JSCanvasRenderingContextCustom.cpp
+    bindings/js/JSDataCueCustom.cpp
     bindings/js/JSDataTransferCustom.cpp
     bindings/js/JSCommandLineAPIHostCustom.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-21  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] implement WebKitDataCue
+        https://bugs.webkit.org/show_bug.cgi?id=131799
+
+        Reviewed by Dean Jackson.
+
+        Tests: http/tests/media/track-in-band-hls-metadata.html
+               media/track/track-datacue-value.html
+
+        * Configurations/FeatureDefines.xcconfig: Define ENABLE_DATACUE_VALUE.
+        * DerivedSources.make: Add ENABLE_DATACUE_VALUE to HTML_FLAGS when appropriate.
+
+        * CMakeLists.txt: Add JSDataCueCustom.cpp.
+        * bindings/js/JSBindingsAllInOne.cpp:
+        * WebCore.xcodeproj/project.pbxproj: Add new files.
+
+        * bindings/js/JSDataCueCustom.cpp: Added.
+        (WebCore::JSDataCue::value): 
+        (WebCore::JSDataCue::setValue):
+        (WebCore::JSDataCueConstructor::constructJSDataCue): Custom constructor.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::updateActiveTextTrackCues): Drive-by fixes: don't schedule timeupdate
+            events when paused, don't call sort on an Vector that can't be sorted.
+
+        * html/track/DataCue.cpp:
+        (WebCore::DataCue::DataCue): Initialize m_type.
+        (WebCore::DataCue::~DataCue): Unprotect the JSValue if necessary.
+        (WebCore::DataCue::data): Ask the platform value for data if non-null.
+        (WebCore::DataCue::setData): Clear m_platformValue and m_value.
+        (WebCore::DataCue::isEqual): New.
+        (WebCore::DataCue::value): Return a JSValue from the platform value, or the value passed
+            to the constructor/set by script.
+        (WebCore::DataCue::setValue): Set m_value.
+        * html/track/DataCue.h:
+        * html/track/DataCue.idl:
+
+        * html/track/InbandDataTextTrack.cpp:
+        (WebCore::InbandDataTextTrack::addDataCue): Don't add the same cue more than once.
+        (WebCore::InbandDataTextTrack::updateDataCue): Update a cue's duration.
+        (WebCore::InbandDataTextTrack::removeDataCue): Remove an incomplete cue.
+        (WebCore::InbandDataTextTrack::removeCue): Remove a cue from the incomplete cue map if necessary.
+        * html/track/InbandDataTextTrack.h:
+
+        * html/track/InbandGenericTextTrack.cpp:
+        (WebCore::InbandGenericTextTrack::addGenericCue): CueMatchRules is now in TextTrackCue instead
+            of VTTCue.
+        * html/track/InbandTextTrack.h:
+
+        * html/track/InbandWebVTTTextTrack.cpp:
+        (WebCore::InbandWebVTTTextTrack::newCuesParsed): Ditto.
+
+        * html/track/TextTrack.cpp:
+        (WebCore::TextTrack::hasCue): Ditto.
+        * html/track/TextTrack.h:
+
+        * html/track/TextTrackCue.cpp:
+        (WebCore::TextTrackCue::isEqual): New, test base class equality.
+        * html/track/TextTrackCue.h:
+
+        * html/track/TextTrackCueGeneric.cpp:
+        (WebCore::TextTrackCueGeneric::isEqual): Call TextTrackCue::isEqual first.
+        * html/track/TextTrackCueGeneric.h:
+
+        * html/track/VTTCue.cpp:
+        (WebCore::VTTCue::isEqual): Call TextTrackCue::isEqual first.
+        * html/track/VTTCue.h:
+
+        * platform/SerializedPlatformRepresentation.h: Added.
+        (WebCore::SerializedPlatformRepresentation::~SerializedPlatformRepresentation):
+        (WebCore::SerializedPlatformRepresentation::SerializedPlatformRepresentation):
+
+        * platform/graphics/InbandTextTrackPrivateClient.h: Add methods for DataCue with SerializedPlatformRepresentation.
+
+        * platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp: Added.
+        (WebCore::InbandMetadataTextTrackPrivateAVF::create):
+        (WebCore::InbandMetadataTextTrackPrivateAVF::InbandMetadataTextTrackPrivateAVF):
+        (WebCore::InbandMetadataTextTrackPrivateAVF::~InbandMetadataTextTrackPrivateAVF):
+        (WebCore::InbandMetadataTextTrackPrivateAVF::addDataCue):
+        (WebCore::InbandMetadataTextTrackPrivateAVF::updatePendingCueEndTimes):
+        (WebCore::InbandMetadataTextTrackPrivateAVF::flushPartialCues):
+        * platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h: Added.
+
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+        (WebCore::MediaPlayerPrivateAVFoundation::seekWithTolerance): currentTrack -> currentTextTrack.
+        (WebCore::MediaPlayerPrivateAVFoundation::seekCompleted): Ditto.
+        (WebCore::MediaPlayerPrivateAVFoundation::configureInbandTracks): Ditto.
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+        (WebCore::MediaPlayerPrivateAVFoundation::setCurrentTextTrack):
+        (WebCore::MediaPlayerPrivateAVFoundation::setCurrentTrack): Deleted.
+
+        Renamed currentTrack and setCurrentTrack to currentTextTrack and setCurrentTextTrack.
+        * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+        (WebCore::AVFWrapper::currentTextTrack):
+        (WebCore::MediaPlayerPrivateAVFoundationCF::setCurrentTextTrack):
+        (WebCore::MediaPlayerPrivateAVFoundationCF::currentTextTrack):
+        (WebCore::AVFWrapper::setCurrentTextTrack):
+        (WebCore::AVFWrapper::AVFWrapper):
+        (WebCore::AVFWrapper::processCue):
+        (WebCore::AVFWrapper::currentTrack): Deleted.
+        (WebCore::MediaPlayerPrivateAVFoundationCF::setCurrentTrack): Deleted.
+        (WebCore::MediaPlayerPrivateAVFoundationCF::currentTrack): Deleted.
+        (WebCore::AVFWrapper::setCurrentTrack): Deleted.
+        * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC):
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::seekToTime): currentTrack -> currentTextTrack
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged): currentTrack -> currentTextTrack.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::processMetadataTrack): New.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::processCue): m_currentTrack -> m_currentTextTrack.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::flushCues): Ditto.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setCurrentTextTrack): Renamed from setCurrentTextTrack.
+        (WebCore::metadataType): Map an AVFoundation metadata key space to a metadata cue type.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::metadataDidArrive): Process new metadata.
+        (-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setCurrentTrack): Deleted.
+
+        Create a JSValue representation from an AVMetadataItem.
+        * platform/mac/SerializedPlatformRepresentationMac.h: Added.
+        (WebCore::SerializedPlatformRepresentationMac::platformType):
+        (WebCore::SerializedPlatformRepresentationMac::nativeValue):
+        * platform/mac/SerializedPlatformRepresentationMac.mm: Added.
+        (WebCore::SerializedPlatformRepresentationMac::SerializedPlatformRepresentationMac):
+        (WebCore::SerializedPlatformRepresentationMac::~SerializedPlatformRepresentationMac):
+        (WebCore::SerializedPlatformRepresentationMac::create):
+        (WebCore::SerializedPlatformRepresentationMac::data):
+        (WebCore::SerializedPlatformRepresentationMac::deserialize):
+        (WebCore::SerializedPlatformRepresentationMac::isEqual):
+        (WebCore::toSerializedPlatformRepresentationMac):
+        (WebCore::jsValueWithValueInContext):
+        (WebCore::jsValueWithDataInContext):
+        (WebCore::jsValueWithArrayInContext):
+        (WebCore::jsValueWithDictionaryInContext):
+        (WebCore::jsValueWithAVMetadataItemInContext):
+
 2014-04-21  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

@@ -210 +210 @@
 ENABLE_VIDEO = ENABLE_VIDEO;
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
+ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
 ENABLE_VIEW_MODE_CSS_MEDIA = ;
 ENABLE_WEBGL = ENABLE_WEBGL;
@@ -244 +245 @@
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));

trunk/Source/WebCore/DerivedSources.make

@@ -955 +955 @@
 endif
 
+ifeq ($(findstring ENABLE_DATACUE_VALUE,$(FEATURE_DEFINES)), ENABLE_DATACUE_VALUE)
+        HTML_FLAGS := $(HTML_FLAGS) ENABLE_DATACUE_VALUE=0
+endif
+
 ifeq ($(findstring ENABLE_ENCRYPTED_MEDIA,$(FEATURE_DEFINES)), ENABLE_ENCRYPTED_MEDIA)
     HTML_FLAGS := $(HTML_FLAGS) ENABLE_ENCRYPTED_MEDIA=1

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -196 +196 @@
                 0779BF0D18453168000B6AE7 /* HTMLMediaElementMediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0779BF0A18453168000B6AE7 /* HTMLMediaElementMediaStream.cpp */; };
                 0779BF0E18453168000B6AE7 /* HTMLMediaElementMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 0779BF0B18453168000B6AE7 /* HTMLMediaElementMediaStream.h */; };
+                077AF14018F4AE400001ED61 /* SerializedPlatformRepresentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 077AF13E18F4AE400001ED61 /* SerializedPlatformRepresentation.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                077AF14318F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 077AF14118F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h */; };
+                077AF14418F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 077AF14218F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm */; };
                 0783228418013ED800999E0C /* MediaStreamAudioSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0783228218013ED700999E0C /* MediaStreamAudioSource.cpp */; };
                 0783228518013ED800999E0C /* MediaStreamAudioSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 0783228318013ED800999E0C /* MediaStreamAudioSource.h */; };
@@ -343 +346 @@
                 07E116B11489C9A100EC5ACE /* JSTextTrackCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E116B01489C9A100EC5ACE /* JSTextTrackCustom.cpp */; };
                 07E117071489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E117061489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp */; };
+                07E9E12E18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h in Headers */ = {isa = PBXBuildFile; fileRef = 07E9E12D18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h */; };
+                07E9E13018F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */; };
                 07ED35A216D6DCC9002248F3 /* InbandTextTrackPrivateAVFIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07357C7716D2DF0D00ED99E7 /* InbandTextTrackPrivateAVFIOS.mm */; };
                 07ED35A316D6DCE2002248F3 /* InbandTextTrackPrivateAVFIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 07357C7616D2DF0D00ED99E7 /* InbandTextTrackPrivateAVFIOS.h */; };
                 07F944161864D046005D31CB /* MediaSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAE8C081746B95700532D78 /* MediaSessionManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                07FBDE2C18FED178001A7CFF /* JSDataCueCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */; };
                 07FE99DC18807A7D00256648 /* HTMLMediaSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FE99DA18807A7D00256648 /* HTMLMediaSession.cpp */; };
                 07FE99DD18807A7D00256648 /* HTMLMediaSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 07FE99DB18807A7D00256648 /* HTMLMediaSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7080 +7086 @@
                 0779BF0B18453168000B6AE7 /* HTMLMediaElementMediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLMediaElementMediaStream.h; sourceTree = "<group>"; };
                 0779BF0C18453168000B6AE7 /* HTMLMediaElementMediaStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLMediaElementMediaStream.idl; sourceTree = "<group>"; };
+                077AF13E18F4AE400001ED61 /* SerializedPlatformRepresentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedPlatformRepresentation.h; sourceTree = "<group>"; };
+                077AF14118F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedPlatformRepresentationMac.h; sourceTree = "<group>"; };
+                077AF14218F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SerializedPlatformRepresentationMac.mm; sourceTree = "<group>"; };
                 0783228218013ED700999E0C /* MediaStreamAudioSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamAudioSource.cpp; sourceTree = "<group>"; };
                 0783228318013ED800999E0C /* MediaStreamAudioSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamAudioSource.h; sourceTree = "<group>"; };
@@ -7166 +7175 @@
                 07E116B01489C9A100EC5ACE /* JSTextTrackCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackCustom.cpp; sourceTree = "<group>"; };
                 07E117061489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackCueCustom.cpp; sourceTree = "<group>"; };
+                07E9E12D18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InbandMetadataTextTrackPrivateAVF.h; sourceTree = "<group>"; };
+                07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InbandMetadataTextTrackPrivateAVF.cpp; sourceTree = "<group>"; };
+                07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDataCueCustom.cpp; sourceTree = "<group>"; };
                 07FE99DA18807A7D00256648 /* HTMLMediaSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLMediaSession.cpp; sourceTree = "<group>"; };
                 07FE99DB18807A7D00256648 /* HTMLMediaSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLMediaSession.h; sourceTree = "<group>"; };
@@ -14310 +14322 @@
                                 DF9AFD6F13FC31B00015FEB7 /* objc */,
                                 CDE3A85217F5FCE600C5BE20 /* AudioTrackPrivateAVF.h */,
+                                07E9E12D18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h */,
+                                07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */,
                                 07B442D4166C70B000556CAD /* InbandTextTrackPrivateAVF.cpp */,
                                 07B442D5166C70B000556CAD /* InbandTextTrackPrivateAVF.h */,
@@ -16170 +16184 @@
                                 1AA84F02143BA7BD0051D153 /* ScrollElasticityController.mm */,
                                 9353676A09AED88B00D35CD6 /* ScrollViewMac.mm */,
+                                077AF14118F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h */,
+                                077AF14218F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm */,
                                 1A4A95510B4EDCFF002D8C3C /* SharedBufferMac.mm */,
                                 93309E9F099EB78C0056E581 /* SharedTimerMac.mm */,
@@ -20529 +20545 @@
                         isa = PBXGroup;
                         children = (
+                                07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */,
                                 BC2ED6BB0C6BD2F000920BFF /* JSAttrCustom.cpp */,
                                 FDEAAAEF12B02EE400DCF33B /* JSAudioBufferSourceNodeCustom.cpp */,
@@ -21074 +21091 @@
                                 BC6D6E2509AF943500F59759 /* ScrollView.h */,
                                 AB7170880B3118080017123E /* SearchPopupMenu.h */,
+                                077AF13E18F4AE400001ED61 /* SerializedPlatformRepresentation.h */,
                                 1A4A954B0B4EDCCB002D8C3C /* SharedBuffer.cpp */,
                                 1A4A954C0B4EDCCB002D8C3C /* SharedBuffer.h */,
@@ -22955 +22973 @@
                                 31A795C71888BCB200382F90 /* ANGLEInstancedArrays.h in Headers */,
                                 490707E71219C04300D90E51 /* ANGLEWebKitBridge.h in Headers */,
+                                077AF14018F4AE400001ED61 /* SerializedPlatformRepresentation.h in Headers */,
                                 49E912AB0EFAC906009D0CAF /* Animation.h in Headers */,
                                 316FE1120E6E1DA700BF6088 /* AnimationBase.h in Headers */,
@@ -23039 +23058 @@
                                 51741D0F0B07259A00ED442C /* BackForwardClient.h in Headers */,
                                 BCA8C81E11E3D36900812FB7 /* BackForwardController.h in Headers */,
+                                077AF14318F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h in Headers */,
                                 BCA8CA6011E4E6D100812FB7 /* BackForwardList.h in Headers */,
                                 BC124EE80C2641CD009E2349 /* BarProp.h in Headers */,
@@ -23951 +23971 @@
                                 C5D4AA7A116BAFB60069CA93 /* GlyphMetricsMap.h in Headers */,
                                 0873B86B136064EA00A522C2 /* GlyphPage.h in Headers */,
+                                07E9E12E18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h in Headers */,
                                 B2C3DA6E0D006CD600EF6F26 /* GlyphPageTreeNode.h in Headers */,
                                 BC53C5F50DA56B920021EB5D /* Gradient.h in Headers */,
@@ -27528 +27549 @@
                                 E44613AA0CD6331000FADA75 /* HTMLVideoElement.cpp in Sources */,
                                 0B8C56D40F28627F000502E1 /* HTTPHeaderMap.cpp in Sources */,
+                                077AF14418F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm in Sources */,
                                 514C76720CE923A1007EF3CD /* HTTPParsers.cpp in Sources */,
                                 371A67CB11C6C7DB00047B8B /* HyphenationCF.cpp in Sources */,
@@ -27955 +27977 @@
                                 CDA98E0616039E1F00FEA3B1 /* JSMediaKeySession.cpp in Sources */,
                                 BC3C39B60C0D3D8D005F4D7A /* JSMediaList.cpp in Sources */,
+                                07E9E13018F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp in Sources */,
                                 D3A94A46122DC40F00A37BBC /* JSMediaQueryList.cpp in Sources */,
                                 7C5343FC17B74B63004232F0 /* JSMediaQueryListListener.cpp in Sources */,
@@ -28967 +28990 @@
                                 97BC6A541505F081001B74AC /* SQLTransactionClient.cpp in Sources */,
                                 97BC6A561505F081001B74AC /* SQLTransactionCoordinator.cpp in Sources */,
+                                07FBDE2C18FED178001A7CFF /* JSDataCueCustom.cpp in Sources */,
                                 FE36FD1616C7826500F887C1 /* SQLTransactionStateMachine.cpp in Sources */,
                                 97BC6A5A1505F081001B74AC /* SQLTransactionSync.cpp in Sources */,

trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp

@@ -62 +62 @@
 #include "JSDOMWindowShell.cpp"
 #include "JSDOMWrapper.cpp"
+#include "JSDataCueCustom.cpp"
 #include "JSDataTransferCustom.cpp"
 #include "JSDedicatedWorkerGlobalScopeCustom.cpp"

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1381 +1381 @@
     if (m_readyState != HAVE_NOTHING && m_player) {
         currentCues = m_cueTree.allOverlaps(m_cueTree.createInterval(movieTime, movieTime));
-        std::sort(currentCues.begin(), currentCues.end(), &compareCueInterval);
+        if (currentCues.size() > 1)
+            std::sort(currentCues.begin(), currentCues.end(), &compareCueInterval);
     }
 
@@ -1427 +1428 @@
     // fired as part of the overall process of changing the current playback
     // position.)
-    if (m_lastSeekTime <= lastTime)
+    if (!m_paused && m_lastSeekTime <= lastTime)
         scheduleTimeupdateEvent(false);
 

trunk/Source/WebCore/html/track/DataCue.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2014 Cable Television Labs Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32 +33 @@
 #include "TextTrack.h"
 #include "TextTrackCueList.h"
+#include <runtime/Protect.h>
 
 namespace WebCore {
 
-DataCue::DataCue(ScriptExecutionContext& context, double start, double end, ArrayBuffer* data, ExceptionCode& ec)
+DataCue::DataCue(ScriptExecutionContext& context, double start, double end, ArrayBuffer* data, const String& type, ExceptionCode& ec)
     : TextTrackCue(context, start, end)
+    , m_type(type)
 {
     setData(data, ec);
@@ -47 +50 @@
 }
 
-DataCue::~DataCue()
+#if ENABLE(DATACUE_VALUE)
+DataCue::DataCue(ScriptExecutionContext& context, double start, double end, PassRefPtr<SerializedPlatformRepresentation> platformValue, const String& type)
+    : TextTrackCue(context, start, end)
+    , m_type(type)
+    , m_platformValue(platformValue)
 {
 }
 
-RefPtr<ArrayBuffer> DataCue::data() const
+DataCue::DataCue(ScriptExecutionContext& context, double start, double end, JSC::JSValue value, const String& type)
+    : TextTrackCue(context, start, end)
+    , m_type(type)
+    , m_value(value)
 {
-    ASSERT_WITH_SECURITY_IMPLICATION(m_data);
+}
+#endif
+
+DataCue::~DataCue()
+{
+#if ENABLE(DATACUE_VALUE)
+    if (m_value)
+        JSC::gcUnprotect(m_value);
+#endif
+}
+
+PassRefPtr<ArrayBuffer> DataCue::data() const
+{
+#if ENABLE(DATACUE_VALUE)
+    if (m_platformValue)
+        return m_platformValue->data();
+#endif
+
+    if (!m_data)
+        return nullptr;
+
     return ArrayBuffer::create(m_data.get());
 }
@@ -59 +89 @@
 void DataCue::setData(ArrayBuffer* data, ExceptionCode& ec)
 {
-    if (!data)
+    if (!data) {
         ec = TypeError;
-    else
-        m_data = ArrayBuffer::create(data);
+        return;
+    }
+
+#if ENABLE(DATACUE_VALUE)
+    m_platformValue = nullptr;
+    m_value = JSC::JSValue();
+#endif
+
+    m_data = ArrayBuffer::create(data);
 }
 
+#if !ENABLE(DATACUE_VALUE)
 String DataCue::text(bool& isNull) const
 {
@@ -70 +108 @@
     return String();
 }
+#endif
 
 DataCue* toDataCue(TextTrackCue* cue)
@@ -83 +122 @@
 }
 
+bool DataCue::isEqual(const TextTrackCue& cue, TextTrackCue::CueMatchRules match) const
+{
+    if (!TextTrackCue::isEqual(cue, match))
+        return false;
+
+    if (cue.cueType() != TextTrackCue::Data)
+        return false;
+
+    const DataCue* dataCue = toDataCue(&cue);
+    RefPtr<ArrayBuffer> otherData = dataCue->data();
+    if ((otherData && !m_data) || (!otherData && m_data))
+        return false;
+    if (m_data && m_data->byteLength() != otherData->byteLength())
+        return false;
+    if (m_data && m_data->data() && memcmp(m_data->data(), otherData->data(), m_data->byteLength()))
+        return false;
+
+#if ENABLE(DATACUE_VALUE)
+    RefPtr<SerializedPlatformRepresentation> otherPlatformValue = dataCue->platformValue();
+    if ((otherPlatformValue && !m_platformValue) || (!otherPlatformValue && m_platformValue))
+        return false;
+    if (m_platformValue && !m_platformValue->isEqual(*otherPlatformValue.get()))
+        return false;
+
+    JSC::JSValue otherValue = dataCue->value(nullptr);
+    if ((otherValue && !m_value) || (!otherValue && m_value))
+        return false;
+    if (!JSC::JSValue::strictEqual(nullptr, m_value ? m_value : JSC::JSValue(), otherValue))
+        return false;
+#endif
+
+    return true;
+}
+
+#if ENABLE(DATACUE_VALUE)
+JSC::JSValue DataCue::value(JSC::ExecState* exec) const
+{
+    if (exec && m_platformValue)
+        return m_platformValue->deserialize(exec);
+
+    if (m_value)
+        return m_value;
+
+    return JSC::jsNull();
+}
+
+void DataCue::setValue(JSC::ExecState*, JSC::JSValue value)
+{
+    // FIXME: this should use a SerializedScriptValue.
+    if (m_value)
+        JSC::gcUnprotect(m_value);
+    m_value = value;
+    if (m_value)
+        JSC::gcProtect(m_value);
+
+    m_platformValue = nullptr;
+    m_data = nullptr;
+}
+#endif
+
 } // namespace WebCore
 

trunk/Source/WebCore/html/track/DataCue.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2014 Cable Television Labs Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31 +32 @@
 #include "TextTrackCue.h"
 #include <runtime/ArrayBuffer.h>
+#include <runtime/JSCInlines.h>
 #include <wtf/RefCounted.h>
+
+#if ENABLE(DATACUE_VALUE)
+#include "SerializedPlatformRepresentation.h"
+#endif
 
 namespace WebCore {
@@ -41 +47 @@
     static PassRefPtr<DataCue> create(ScriptExecutionContext& context, double start, double end, ArrayBuffer* data, ExceptionCode& ec)
     {
-        return adoptRef(new DataCue(context, start, end, data, ec));
+        return adoptRef(new DataCue(context, start, end, data, emptyString(), ec));
     }
 
@@ -49 +55 @@
     }
 
+    static PassRefPtr<DataCue> create(ScriptExecutionContext& context, double start, double end, ArrayBuffer* data, const String& type, ExceptionCode& ec)
+    {
+        return adoptRef(new DataCue(context, start, end, data, type, ec));
+    }
+
+#if ENABLE(DATACUE_VALUE)
+    static PassRefPtr<DataCue> create(ScriptExecutionContext& context, double start, double end, PassRefPtr<SerializedPlatformRepresentation> platformValue, const String& type)
+    {
+        return adoptRef(new DataCue(context, start, end, platformValue, type));
+    }
+
+    static PassRefPtr<DataCue> create(ScriptExecutionContext& context, double start, double end, JSC::JSValue value, const String& type)
+    {
+        return adoptRef(new DataCue(context, start, end, value, type));
+    }
+#endif
+
     virtual ~DataCue();
     virtual CueType cueType() const { return Data; }
 
-    RefPtr<ArrayBuffer> data() const;
+    PassRefPtr<ArrayBuffer> data() const;
     void setData(ArrayBuffer*, ExceptionCode&);
-    String text(bool& isNull) const;
+
+#if ENABLE(DATACUE_VALUE)
+    const PassRefPtr<SerializedPlatformRepresentation> platformValue() const { return m_platformValue; }
+
+    JSC::JSValue value(JSC::ExecState*) const;
+    void setValue(JSC::ExecState*, JSC::JSValue);
+
+    String type() const { return m_type; }
+    void setType(const String& type) { m_type = type; }
+#else
+    String text(bool&) const;
+#endif
+
+    virtual bool isEqual(const TextTrackCue&, CueMatchRules) const override;
 
 protected:
-    DataCue(ScriptExecutionContext&, double start, double end, ArrayBuffer*, ExceptionCode&);
-    DataCue(ScriptExecutionContext&, double start, double end, const void* data, unsigned length);
+    DataCue(ScriptExecutionContext&, double start, double end, ArrayBuffer*, const String&, ExceptionCode&);
+    DataCue(ScriptExecutionContext&, double start, double end, const void*, unsigned);
+#if ENABLE(DATACUE_VALUE)
+    DataCue(ScriptExecutionContext&, double start, double end, PassRefPtr<SerializedPlatformRepresentation>, const String&);
+    DataCue(ScriptExecutionContext&, double start, double end, JSC::JSValue, const String&);
+#endif
 
 private:
     RefPtr<ArrayBuffer> m_data;
+    String m_type;
+#if ENABLE(DATACUE_VALUE)
+    RefPtr<SerializedPlatformRepresentation> m_platformValue;
+    JSC::JSValue m_value;
+#endif
 };
 

trunk/Source/WebCore/html/track/DataCue.idl

@@ -1 +1 @@
 /*
  * Copyright (C) 2014 Cable Television Labs Inc.  All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25 +26 @@
 [
     Conditional=VIDEO_TRACK,
-    Constructor(double startTime, double endTime, [StrictTypeChecking] ArrayBuffer data),
-    ConstructorCallWith=ScriptExecutionContext,
+    CustomConstructor,
+#if defined(ENABLE_DATACUE_VALUE) && ENABLE_DATACUE_VALUE
+    CustomConstructor(double startTime, double endTime, any value, optional DOMString type),
+    InterfaceName=WebKitDataCue,
+#else
+    CustomConstructor(double startTime, double endTime, ArrayBuffer data),
+#endif
     ConstructorRaisesException,
 ] interface DataCue : TextTrackCue {
     [SetterRaisesException] attribute ArrayBuffer data;
+
+#if defined(ENABLE_DATACUE_VALUE) && ENABLE_DATACUE_VALUE
+    [CustomGetter, CustomSetter] attribute any value;
+    readonly attribute DOMString type;
+#else
     readonly attribute DOMString? text;
+#endif
 };

trunk/Source/WebCore/html/track/InbandDataTextTrack.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2014 Cable Television Labs Inc.  All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31 +32 @@
 #include "DataCue.h"
 #include "ExceptionCodePlaceholder.h"
+#include "HTMLMediaElement.h"
 #include "InbandTextTrackPrivate.h"
+#include "Logging.h"
 #include <runtime/ArrayBuffer.h>
 
@@ -56 +59 @@
 }
 
+#if ENABLE(DATACUE_VALUE)
+void InbandDataTextTrack::addDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation> prpPlatformValue, const String& type)
+{
+    RefPtr<SerializedPlatformRepresentation> platformValue = prpPlatformValue;
+    if (m_incompleteCueMap.find(platformValue.get()) != m_incompleteCueMap.end())
+        return;
+
+    RefPtr<DataCue> cue = DataCue::create(*scriptExecutionContext(), start, end, platformValue, type);
+    if (hasCue(cue.get(), TextTrackCue::IgnoreDuration)) {
+        LOG(Media, "InbandDataTextTrack::addDataCue ignoring already added cue: start=%.2f, end=%.2f\n", cue->startTime(), cue->endTime());
+        return;
+    }
+
+    if (std::isinf(end) && mediaElement()) {
+        cue->setEndTime(mediaElement()->duration(), IGNORE_EXCEPTION);
+        m_incompleteCueMap.add(platformValue, cue);
+    }
+
+    addCue(cue.release(), ASSERT_NO_EXCEPTION);
+}
+
+void InbandDataTextTrack::updateDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation> prpPlatformValue)
+{
+    RefPtr<SerializedPlatformRepresentation> platformValue = prpPlatformValue;
+    auto iter = m_incompleteCueMap.find(platformValue.get());
+    if (iter == m_incompleteCueMap.end())
+        return;
+
+    RefPtr<DataCue> cue = iter->value;
+    if (!cue)
+        return;
+
+    cue->willChange();
+
+    if (std::isinf(end) && mediaElement())
+        end = mediaElement()->duration();
+    else
+        m_incompleteCueMap.remove(platformValue.get());
+
+    LOG(Media, "InbandDataTextTrack::updateDataCue: was start=%.2f, end=%.2f, will be start=%.2f, end=%.2f\n", cue->startTime(), cue->endTime(), start, end);
+
+    cue->setStartTime(start, IGNORE_EXCEPTION);
+    cue->setEndTime(end, IGNORE_EXCEPTION);
+
+    cue->didChange();
+}
+
+void InbandDataTextTrack::removeDataCue(InbandTextTrackPrivate*, double, double, PassRefPtr<SerializedPlatformRepresentation> prpPlatformValue)
+{
+    RefPtr<SerializedPlatformRepresentation> platformValue = prpPlatformValue;
+    auto iter = m_incompleteCueMap.find(platformValue.get());
+    if (iter == m_incompleteCueMap.end())
+        return;
+
+    RefPtr<DataCue> cue = iter->value;
+    if (cue) {
+        LOG(Media, "InbandDataTextTrack::removeDataCue removing cue: start=%.2f, end=%.2f\n", cue->startTime(), cue->endTime());
+        removeCue(cue.get(), IGNORE_EXCEPTION);
+    }
+}
+
+void InbandDataTextTrack::removeCue(TextTrackCue* cue, ExceptionCode& ec)
+{
+    ASSERT(cue->cueType() == TextTrackCue::Data);
+
+    RefPtr<SerializedPlatformRepresentation> platformValue = toDataCue(cue)->platformValue().get();
+    auto iter = m_incompleteCueMap.find(platformValue.get());
+    if (iter != m_incompleteCueMap.end())
+        m_incompleteCueMap.remove(platformValue.get());
+
+    InbandTextTrack::removeCue(cue, ec);
+}
+
+#endif
+
 } // namespace WebCore
 

trunk/Source/WebCore/html/track/InbandDataTextTrack.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2014 Cable Television Labs Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34 +35 @@
 namespace WebCore {
 
+class DataCue;
 class Document;
 class InbandTextTrackPrivate;
-class TextTrackCue;
+
+#if ENABLE(DATACUE_VALUE)
+class SerializedPlatformRepresentation;
+#endif
 
 class InbandDataTextTrack : public InbandTextTrack {
@@ -47 +52 @@
 
     virtual void addDataCue(InbandTextTrackPrivate*, double start, double end, const void*, unsigned) override;
+
+#if ENABLE(DATACUE_VALUE)
+    virtual void addDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation>, const String&) override;
+    virtual void updateDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation>) override;
+    virtual void removeDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation>) override;
+    virtual void removeCue(TextTrackCue*, ExceptionCode&) override;
+
+    HashMap<RefPtr<SerializedPlatformRepresentation>, RefPtr<DataCue>> m_incompleteCueMap;
+#endif
 };
 

trunk/Source/WebCore/html/track/InbandGenericTextTrack.cpp

@@ -152 +152 @@
     RefPtr<TextTrackCueGeneric> cue = TextTrackCueGeneric::create(*scriptExecutionContext(), cueData->startTime(), cueData->endTime(), cueData->content());
     updateCueFromCueData(cue.get(), cueData.get());
-    if (hasCue(cue.get(), VTTCue::IgnoreDuration)) {
+    if (hasCue(cue.get(), TextTrackCue::IgnoreDuration)) {
         LOG(Media, "InbandGenericTextTrack::addGenericCue ignoring already added cue: start=%.2f, end=%.2f, content=\"%s\"\n", cueData->startTime(), cueData->endTime(), cueData->content().utf8().data());
         return;

trunk/Source/WebCore/html/track/InbandTextTrack.h

@@ -72 +72 @@
     virtual void addDataCue(InbandTextTrackPrivate*, double, double, const void*, unsigned) override { ASSERT_NOT_REACHED(); }
 
+#if ENABLE(DATACUE_VALUE)
+    virtual void addDataCue(InbandTextTrackPrivate*, double, double, PassRefPtr<SerializedPlatformRepresentation>, const String&) override { ASSERT_NOT_REACHED(); }
+    virtual void updateDataCue(InbandTextTrackPrivate*, double, double, PassRefPtr<SerializedPlatformRepresentation>) override  { ASSERT_NOT_REACHED(); }
+    virtual void removeDataCue(InbandTextTrackPrivate*, double, double, PassRefPtr<SerializedPlatformRepresentation>) override  { ASSERT_NOT_REACHED(); }
+#endif
+
     virtual void addGenericCue(InbandTextTrackPrivate*, PassRefPtr<GenericCueData>) override { ASSERT_NOT_REACHED(); }
     virtual void updateGenericCue(InbandTextTrackPrivate*, GenericCueData*) override { ASSERT_NOT_REACHED(); }

trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp

@@ -69 +69 @@
         cue->setCueSettings(cueData->settings());
 
-        if (hasCue(cue.get(), VTTCue::IgnoreDuration)) {
+        if (hasCue(cue.get(), TextTrackCue::IgnoreDuration)) {
             LOG(Media, "InbandWebVTTTextTrack::newCuesParsed ignoring already added cue: start=%.2f, end=%.2f, content=\"%s\"\n", cueData->startTime(), cueData->endTime(), cueData->content().utf8().data());
             return;

trunk/Source/WebCore/html/track/TextTrack.cpp

@@ -484 +484 @@
 }
 
-bool TextTrack::hasCue(VTTCue* cue, VTTCue::CueMatchRules match)
+bool TextTrack::hasCue(TextTrackCue* cue, TextTrackCue::CueMatchRules match)
 {
     if (cue->startTime() < 0 || cue->endTime() < 0)
@@ -520 +520 @@
 
                 existingCue = m_cues->item(searchStart - 1);
-                if (!cue->isRenderable())
-                    continue;
-
                 if (!existingCue || cue->startTime() > existingCue->startTime())
                     return false;
 
-                if (!toVTTCue(existingCue)->isEqual(*cue, match))
+                if (!existingCue->isEqual(*cue, match))
                     continue;
                 
@@ -535 +532 @@
         size_t index = (searchStart + searchEnd) / 2;
         existingCue = m_cues->item(index);
-        if (cue->startTime() < existingCue->startTime() || (match != VTTCue::IgnoreDuration && cue->startTime() == existingCue->startTime() && cue->endTime() > existingCue->endTime()))
+        if (cue->startTime() < existingCue->startTime() || (match != TextTrackCue::IgnoreDuration && cue->startTime() == existingCue->startTime() && cue->endTime() > existingCue->endTime()))
             searchEnd = index;
         else

trunk/Source/WebCore/html/track/TextTrack.h

@@ -113 +113 @@
     virtual void removeCue(TextTrackCue*, ExceptionCode&);
 
-    bool hasCue(VTTCue*, VTTCue::CueMatchRules = VTTCue::MatchAllFields);
+    bool hasCue(TextTrackCue*, TextTrackCue::CueMatchRules = TextTrackCue::MatchAllFields);
 
 #if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)

trunk/Source/WebCore/html/track/TextTrackCue.cpp

@@ -203 +203 @@
 }
 
+bool TextTrackCue::isEqual(const TextTrackCue& cue, TextTrackCue::CueMatchRules match) const
+{
+    if (cueType() != cue.cueType())
+        return false;
+
+    if (match != IgnoreDuration && endTime() != cue.endTime())
+        return false;
+    if (startTime() != cue.startTime())
+        return false;
+    if (id() != cue.id())
+        return false;
+
+    return true;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/html/track/TextTrackCue.h

@@ -92 +92 @@
     virtual bool isRenderable() const { return false; }
 
+    enum CueMatchRules {
+        MatchAllFields,
+        IgnoreDuration,
+    };
+    virtual bool isEqual(const TextTrackCue&, CueMatchRules) const;
+
     void willChange();
     virtual void didChange();

trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp

@@ -152 +152 @@
 }
     
-bool TextTrackCueGeneric::isEqual(const VTTCue& cue, VTTCue::CueMatchRules match) const
+bool TextTrackCueGeneric::isEqual(const TextTrackCue& cue, TextTrackCue::CueMatchRules match) const
 {
+    if (!TextTrackCue::isEqual(cue, match))
+        return false;
+
     if (cue.cueType() != TextTrackCue::Generic)
         return false;

trunk/Source/WebCore/html/track/TextTrackCueGeneric.h

@@ -73 +73 @@
     virtual void setFontSize(int, const IntSize&, bool important) override;
 
-    virtual bool isEqual(const VTTCue&, CueMatchRules) const override;
+    virtual bool isEqual(const TextTrackCue&, CueMatchRules) const override;
 
     virtual TextTrackCue::CueType cueType() const override { return TextTrackCue::Generic; }

trunk/Source/WebCore/html/track/VTTCue.cpp

@@ -1063 +1063 @@
 }
 
-bool VTTCue::isEqual(const VTTCue& cue, CueMatchRules match) const
-{
-    if (cueType() != cue.cueType())
+bool VTTCue::isEqual(const TextTrackCue& cue, TextTrackCue::CueMatchRules match) const
+{
+    if (!TextTrackCue::isEqual(cue, match))
         return false;
-    
-    if (match != IgnoreDuration && endTime() != cue.endTime())
+
+    if (cue.cueType() != WebVTT)
         return false;
-    if (startTime() != cue.startTime())
+
+    const VTTCue* vttCue = toVTTCue(&cue);
+    if (text() != vttCue->text())
         return false;
-    if (text() != cue.text())
+    if (cueSettings() != vttCue->cueSettings())
         return false;
-    if (cueSettings() != cue.cueSettings())
+    if (position() != vttCue->position())
         return false;
-    if (id() != cue.id())
+    if (line() != vttCue->line())
         return false;
-    if (position() != cue.position())
+    if (size() != vttCue->size())
         return false;
-    if (line() != cue.line())
-        return false;
-    if (size() != cue.size())
-        return false;
-    if (align() != cue.align())
+    if (align() != vttCue->align())
         return false;
     

trunk/Source/WebCore/html/track/VTTCue.h

@@ -154 +154 @@
     virtual void setFontSize(int, const IntSize&, bool important);
 
-    enum CueMatchRules {
-        MatchAllFields,
-        IgnoreDuration,
-    };
-    virtual bool isEqual(const VTTCue&, CueMatchRules) const;
+    virtual bool isEqual(const TextTrackCue&, CueMatchRules) const override;
 
     virtual CueType cueType() const { return WebVTT; }

trunk/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h

@@ -29 +29 @@
 #include "Color.h"
 #include "TrackPrivateBase.h"
+
+#if ENABLE(DATACUE_VALUE)
+#include "SerializedPlatformRepresentation.h"
+#endif
 
 #if ENABLE(VIDEO_TRACK)
@@ -129 +133 @@
 };
 
-class WebVTTCueData;
-
 class InbandTextTrackPrivateClient : public TrackPrivateBaseClient {
 public:
@@ -136 +138 @@
 
     virtual void addDataCue(InbandTextTrackPrivate*, double start, double end, const void*, unsigned) = 0;
+
+#if ENABLE(DATACUE_VALUE)
+    virtual void addDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation>, const String&) = 0;
+    virtual void updateDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation>) = 0;
+    virtual void removeDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation>) = 0;
+#endif
 
     virtual void addGenericCue(InbandTextTrackPrivate*, PassRefPtr<GenericCueData>) = 0;

trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp

@@ -282 +282 @@
         return;
 
-    if (currentTrack())
-        currentTrack()->beginSeeking();
-    
+    if (currentTextTrack())
+        currentTextTrack()->beginSeeking();
+
     LOG(Media, "MediaPlayerPrivateAVFoundation::seek(%p) - seeking to %f", this, time);
 
@@ -660 +660 @@
     }
 
-    if (currentTrack())
-        currentTrack()->endSeeking();
+    if (currentTextTrack())
+        currentTextTrack()->endSeeking();
 
     updateStates();
@@ -930 +930 @@
     }
 
-    setCurrentTrack(trackToEnable.get());
+    setCurrentTextTrack(trackToEnable.get());
 }
 

trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h

@@ -40 +40 @@
 namespace WebCore {
 
+class InbandMetadataTextTrackPrivateAVF;
 class InbandTextTrackPrivateAVF;
 class GenericCueData;
@@ -58 +59 @@
     virtual void contentsNeedsDisplay() { }
     virtual void configureInbandTracks();
-    virtual void setCurrentTrack(InbandTextTrackPrivateAVF*) { }
-    virtual InbandTextTrackPrivateAVF* currentTrack() const = 0;
+    virtual void setCurrentTextTrack(InbandTextTrackPrivateAVF*) { }
+    virtual InbandTextTrackPrivateAVF* currentTextTrack() const = 0;
 #if ENABLE(IOS_AIRPLAY)
     void playbackTargetIsWirelessChanged();
@@ -302 +303 @@
     void clearTextTracks();
     Vector<RefPtr<InbandTextTrackPrivateAVF>> m_textTracks;
-    
+
 private:
     MediaPlayer* m_player;

trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp

@@ -111 +111 @@
     void updateVideoLayerGravity();
 
-    void setCurrentTrack(InbandTextTrackPrivateAVF*);
-    InbandTextTrackPrivateAVF* currentTrack() const { return m_currentTrack; }
+    void setCurrentTextTrack(InbandTextTrackPrivateAVF*);
+    InbandTextTrackPrivateAVF* currentTextTrack() const { return m_currentTextTrack; }
 
 #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP) && HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
@@ -171 +171 @@
     COMPtr<IDirect3DDevice9Ex> m_d3dDevice;
 
-    InbandTextTrackPrivateAVF* m_currentTrack;
+    InbandTextTrackPrivateAVF* m_currentTextTrack;
 };
 
@@ -393 +393 @@
 }
 
-void MediaPlayerPrivateAVFoundationCF::setCurrentTrack(InbandTextTrackPrivateAVF* track)
+void MediaPlayerPrivateAVFoundationCF::setCurrentTextTrack(InbandTextTrackPrivateAVF* track)
 {
     if (m_avfWrapper)
-        m_avfWrapper->setCurrentTrack(track);
-}
-
-InbandTextTrackPrivateAVF* MediaPlayerPrivateAVFoundationCF::currentTrack() const
+        m_avfWrapper->setCurrentTextTrack(track);
+}
+
+InbandTextTrackPrivateAVF* MediaPlayerPrivateAVFoundationCF::currentTextTrack() const
 {
     if (m_avfWrapper)
-        return m_avfWrapper->currentTrack();
+        return m_avfWrapper->currentTextTrack();
 
     return 0;
@@ -1103 +1103 @@
 #endif // HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
 
-void AVFWrapper::setCurrentTrack(InbandTextTrackPrivateAVF* track)
-{
-    if (m_currentTrack == track)
-        return;
-
-    LOG(Media, "MediaPlayerPrivateAVFoundationCF::setCurrentTrack(%p) - selecting track %p, language = %s", this, track, track ? track->language().string().utf8().data() : "");
+void AVFWrapper::setCurrentTextTrack(InbandTextTrackPrivateAVF* track)
+{
+    if (m_currentTextTrack == track)
+        return;
+
+    LOG(Media, "MediaPlayerPrivateAVFoundationCF::setCurrentTextTrack(%p) - selecting track %p, language = %s", this, track, track ? track->language().string().utf8().data() : "");
         
-    m_currentTrack = track;
+    m_currentTextTrack = track;
 
     if (track) {
@@ -1188 +1188 @@
     : m_owner(owner)
     , m_objectID(s_nextAVFWrapperObjectID++)
-    , m_currentTrack(0)
+    , m_currentTextTrack(0)
 {
     ASSERT(isMainThread());
@@ -1622 +1622 @@
     }
 
-    if (!self->m_currentTrack)
-        return;
-
-    self->m_currentTrack->processCue(legibleOutputData->m_attributedStrings.get(), legibleOutputData->m_time);
+    if (!self->m_currentTextTrack)
+        return;
+
+    self->m_currentTextTrack->processCue(legibleOutputData->m_attributedStrings.get(), legibleOutputData->m_time);
 }
 

trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h

@@ -109 +109 @@
 #endif
 
-    virtual void setCurrentTrack(InbandTextTrackPrivateAVF*) override;
-    virtual InbandTextTrackPrivateAVF* currentTrack() const override;
+    virtual void setCurrentTextTrack(InbandTextTrackPrivateAVF*) override;
+    virtual InbandTextTrackPrivateAVF* currentTextTrack() const override;
 
 #if !HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h

@@ -61 +61 @@
 
 class WebCoreAVFResourceLoader;
+class InbandMetadataTextTrackPrivateAVF;
 class InbandTextTrackPrivateAVFObjC;
 class AudioTrackPrivateAVFObjC;
@@ -109 +110 @@
     void durationDidChange(double);
     void rateDidChange(double);
-    void metadataDidArrive(RetainPtr<NSArray>);
+    void metadataDidArrive(RetainPtr<NSArray>, double);
 
 #if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
@@ -236 +237 @@
 #endif
 
-    virtual void setCurrentTrack(InbandTextTrackPrivateAVF*) override;
-    virtual InbandTextTrackPrivateAVF* currentTrack() const override { return m_currentTrack; }
+#if ENABLE(DATACUE_VALUE)
+    void processMetadataTrack();
+#endif
+
+    virtual void setCurrentTextTrack(InbandTextTrackPrivateAVF*) override;
+    virtual InbandTextTrackPrivateAVF* currentTextTrack() const override { return m_currentTextTrack; }
 
 #if !HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
@@ -303 +308 @@
 #endif
 
-    InbandTextTrackPrivateAVF* m_currentTrack;
+    InbandTextTrackPrivateAVF* m_currentTextTrack;
+
+#if ENABLE(DATACUE_VALUE)
+    RefPtr<InbandMetadataTextTrackPrivateAVF> m_metadataTrack;
+#endif
 
     mutable RetainPtr<NSArray> m_cachedSeekableRanges;

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -27 +27 @@
 
 #if ENABLE(VIDEO) && USE(AVFOUNDATION)
-
 #import "MediaPlayerPrivateAVFoundationObjC.h"
 
@@ -41 +40 @@
 #import "GraphicsContext.h"
 #import "GraphicsContextCG.h"
+#import "InbandMetadataTextTrackPrivateAVF.h"
 #import "InbandTextTrackPrivateAVFObjC.h"
 #import "InbandTextTrackPrivateLegacyAVFObjC.h"
@@ -48 +48 @@
 #import "PlatformTimeRanges.h"
 #import "SecurityOrigin.h"
+#import "SerializedPlatformRepresentationMac.h"
 #import "SoftLinking.h"
 #import "TextTrackRepresentation.h"
@@ -63 +64 @@
 #import <wtf/CurrentTime.h>
 #import <wtf/Functional.h>
+#import <wtf/NeverDestroyed.h>
 #import <wtf/text/CString.h>
 #import <wtf/text/StringBuilder.h>
@@ -99 +101 @@
 #endif
 
+typedef AVPlayerItem AVPlayerItemType;
 typedef AVMetadataItem AVMetadataItemType;
 
@@ -145 +148 @@
 SOFT_LINK_POINTER(AVFoundation, AVMediaTypeVideo, NSString *)
 SOFT_LINK_POINTER(AVFoundation, AVMediaTypeAudio, NSString *)
+SOFT_LINK_POINTER(AVFoundation, AVMediaTypeMetadata, NSString *)
 SOFT_LINK_POINTER(AVFoundation, AVPlayerItemDidPlayToEndTimeNotification, NSString *)
 SOFT_LINK_POINTER(AVFoundation, AVURLAssetInheritURIQueryComponentFromReferencingURIKey, NSString *)
@@ -168 +172 @@
 #define AVMediaTypeVideo getAVMediaTypeVideo()
 #define AVMediaTypeAudio getAVMediaTypeAudio()
+#define AVMediaTypeMetadata getAVMediaTypeMetadata()
 #define AVPlayerItemDidPlayToEndTimeNotification getAVPlayerItemDidPlayToEndTimeNotification()
 #define AVURLAssetInheritURIQueryComponentFromReferencingURIKey getAVURLAssetInheritURIQueryComponentFromReferencingURIKey()
@@ -221 +226 @@
 #endif
 
+#if ENABLE(DATACUE_VALUE)
+SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceQuickTimeUserData, NSString*)
+SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceISOUserData, NSString*)
+SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceQuickTimeMetadata, NSString*)
+SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceiTunes, NSString*)
+SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceID3, NSString*)
+
+#define AVMetadataKeySpaceQuickTimeUserData getAVMetadataKeySpaceQuickTimeUserData()
+#define AVMetadataKeySpaceISOUserData getAVMetadataKeySpaceISOUserData()
+#define AVMetadataKeySpaceQuickTimeMetadata getAVMetadataKeySpaceQuickTimeMetadata()
+#define AVMetadataKeySpaceiTunes getAVMetadataKeySpaceiTunes()
+#define AVMetadataKeySpaceID3 getAVMetadataKeySpaceID3()
+#endif
+
 #define kCMTimeZero getkCMTimeZero()
 
@@ -344 +363 @@
     , m_loaderDelegate(adoptNS([[WebCoreAVFLoaderDelegate alloc] initWithCallback:this]))
 #endif
-    , m_currentTrack(0)
+    , m_currentTextTrack(0)
     , m_cachedDuration(MediaPlayer::invalidTime())
     , m_cachedRate(0)
@@ -968 +987 @@
     setDelayCallbacks(true);
 
+    if (m_metadataTrack)
+        m_metadataTrack->flushPartialCues();
+
     CMTime cmTime = CMTimeMakeWithSeconds(time, 600);
     CMTime cmBefore = CMTimeMakeWithSeconds(negativeTolerance, 600);
@@ -1418 +1440 @@
         bool hasVideo = false;
         bool hasAudio = false;
+        bool hasMetaData = false;
         for (AVPlayerItemTrack *track in m_cachedTracks.get()) {
             if ([track isEnabled]) {
                 AVAssetTrack *assetTrack = [track assetTrack];
-                if ([[assetTrack mediaType] isEqualToString:AVMediaTypeVideo])
+                NSString *mediaType = [assetTrack mediaType];
+                if ([mediaType isEqualToString:AVMediaTypeVideo])
                     hasVideo = true;
-                else if ([[assetTrack mediaType] isEqualToString:AVMediaTypeAudio])
+                else if ([mediaType isEqualToString:AVMediaTypeAudio])
                     hasAudio = true;
-                else if ([[assetTrack mediaType] isEqualToString:AVMediaTypeClosedCaption]) {
+                else if ([mediaType isEqualToString:AVMediaTypeClosedCaption]) {
 #if !HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
                     hasCaptions = true;
 #endif
                     haveCCTrack = true;
+                } else if ([mediaType isEqualToString:AVMediaTypeMetadata]) {
+                    hasMetaData = true;
                 }
             }
         }
+
         setHasVideo(hasVideo);
         setHasAudio(hasAudio);
-
+#if ENABLE(DATACUE_VALUE)
+        if (hasMetaData)
+            processMetadataTrack();
+#endif
 
 #if ENABLE(VIDEO_TRACK)
@@ -2018 +2048 @@
 }
 
+void MediaPlayerPrivateAVFoundationObjC::processMetadataTrack()
+{
+    if (m_metadataTrack)
+        return;
+
+    m_metadataTrack = InbandMetadataTextTrackPrivateAVF::create(InbandTextTrackPrivate::Metadata, InbandTextTrackPrivate::Data);
+    m_metadataTrack->setInBandMetadataTrackDispatchType("com.apple.streaming");
+    player()->addTextTrack(m_metadataTrack);
+}
+
 void MediaPlayerPrivateAVFoundationObjC::processCue(NSArray *attributedStrings, double time)
 {
-    if (!m_currentTrack)
-        return;
-
-    m_currentTrack->processCue(reinterpret_cast<CFArrayRef>(attributedStrings), time);
+    if (!m_currentTextTrack)
+        return;
+
+    m_currentTextTrack->processCue(reinterpret_cast<CFArrayRef>(attributedStrings), time);
 }
 
@@ -2030 +2070 @@
     LOG(Media, "MediaPlayerPrivateAVFoundationObjC::flushCues(%p)", this);
 
-    if (!m_currentTrack)
+    if (!m_currentTextTrack)
         return;
     
-    m_currentTrack->resetCueValues();
+    m_currentTextTrack->resetCueValues();
 }
 #endif // HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
 
-void MediaPlayerPrivateAVFoundationObjC::setCurrentTrack(InbandTextTrackPrivateAVF *track)
-{
-    if (m_currentTrack == track)
-        return;
-
-    LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setCurrentTrack(%p) - selecting track %p, language = %s", this, track, track ? track->language().string().utf8().data() : "");
+void MediaPlayerPrivateAVFoundationObjC::setCurrentTextTrack(InbandTextTrackPrivateAVF *track)
+{
+    if (m_currentTextTrack == track)
+        return;
+
+    LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setCurrentTextTrack(%p) - selecting track %p, language = %s", this, track, track ? track->language().string().utf8().data() : "");
         
-    m_currentTrack = track;
+    m_currentTextTrack = track;
 
     if (track) {
@@ -2235 +2275 @@
 }
 
-void MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(RetainPtr<NSArray> metadata)
-{
-    if (!metadata || [metadata isKindOfClass:[NSNull class]])
-        return;
-
-    m_currentMetaData = metadata;
+#if ENABLE(DATACUE_VALUE)
+static const AtomicString& metadataType(NSString *avMetadataKeySpace)
+{
+    static NeverDestroyed<const AtomicString> quickTimeUserData("com.apple.quicktime.udta", AtomicString::ConstructFromLiteral);
+    static NeverDestroyed<const AtomicString> isoUserData("org.mp4ra", AtomicString::ConstructFromLiteral);
+    static NeverDestroyed<const AtomicString> quickTimeMetadata("com.apple.quicktime.mdta", AtomicString::ConstructFromLiteral);
+    static NeverDestroyed<const AtomicString> iTunesMetadata("com.apple.itunes", AtomicString::ConstructFromLiteral);
+    static NeverDestroyed<const AtomicString> id3Metadata("org.id3", AtomicString::ConstructFromLiteral);
+
+    if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceQuickTimeUserData])
+        return quickTimeUserData;
+    if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceISOUserData])
+        return isoUserData;
+    if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceQuickTimeMetadata])
+        return quickTimeMetadata;
+    if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceiTunes])
+        return iTunesMetadata;
+    if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceID3])
+        return id3Metadata;
+
+    return emptyAtom;
+}
+#endif
+
+void MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(RetainPtr<NSArray> metadata, double mediaTime)
+{
+    m_currentMetaData = metadata && ![metadata isKindOfClass:[NSNull class]] ? metadata : nil;
+
+    LOG(Media, "MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(%p) - adding %i cues at time %.2f", this, m_currentMetaData ? [m_currentMetaData.get() count] : 0, mediaTime);
+
+#if ENABLE(DATACUE_VALUE)
+    if (seeking())
+        return;
+
+    if (!metadata || [metadata isKindOfClass:[NSNull class]]) {
+        m_metadataTrack->updatePendingCueEndTimes(mediaTime);
+        return;
+    }
+
+    if (!m_metadataTrack)
+        processMetadataTrack();
+
+    // Set the duration of all incomplete cues before adding new ones.
+    double earliesStartTime = std::numeric_limits<double>::infinity();
+    for (AVMetadataItemType *item in m_currentMetaData.get()) {
+        double start = CMTimeGetSeconds(item.time);
+        if (start < earliesStartTime)
+            earliesStartTime = start;
+    }
+    m_metadataTrack->updatePendingCueEndTimes(earliesStartTime);
+
+    for (AVMetadataItemType *item in m_currentMetaData.get()) {
+        double start = CMTimeGetSeconds(item.time);
+        double end = std::numeric_limits<double>::infinity();
+        if (CMTIME_IS_VALID(item.duration))
+            end = start + CMTimeGetSeconds(item.duration);
+
+        AtomicString type = nullAtom;
+        if (item.keySpace)
+            type = metadataType(item.keySpace);
+
+        m_metadataTrack->addDataCue(start, end, SerializedPlatformRepresentationMac::create(item), type);
+    }
+#endif
 }
 
@@ -2409 +2507 @@
         else if ([keyPath isEqualToString:@"duration"])
             function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::durationDidChange, m_callback, CMTimeGetSeconds([newValue CMTimeValue]));
-        else if ([keyPath isEqualToString:@"timedMetadata"] && newValue)
-            function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::metadataDidArrive, m_callback, RetainPtr<NSArray>(newValue));
+        else if ([keyPath isEqualToString:@"timedMetadata"] && newValue) {
+            double now = 0;
+            CMTime itemTime = [(AVPlayerItemType *)object currentTime];
+            if (CMTIME_IS_NUMERIC(itemTime))
+                now = std::max(narrowPrecisionToFloat(CMTimeGetSeconds(itemTime)), 0.0f);
+            function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::metadataDidArrive, m_callback, RetainPtr<NSArray>(newValue), now);
+        }
     }
 

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-04-21  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] implement WebKitDataCue
+        https://bugs.webkit.org/show_bug.cgi?id=131799
+
+        Reviewed by Dean Jackson.
+
+        * Configurations/FeatureDefines.xcconfig: Define ENABLE_DATACUE_VALUE.
+
 2014-04-21  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

@@ -210 +210 @@
 ENABLE_VIDEO = ENABLE_VIDEO;
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
+ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
 ENABLE_VIEW_MODE_CSS_MEDIA = ;
 ENABLE_WEBGL = ENABLE_WEBGL;
@@ -244 +245 @@
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-21  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] implement WebKitDataCue
+        https://bugs.webkit.org/show_bug.cgi?id=131799
+
+        Reviewed by Dean Jackson.
+
+        * Configurations/FeatureDefines.xcconfig: Define ENABLE_DATACUE_VALUE.
+
 2014-04-21  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

@@ -210 +210 @@
 ENABLE_VIDEO = ENABLE_VIDEO;
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
+ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
 ENABLE_VIEW_MODE_CSS_MEDIA = ;
 ENABLE_WEBGL = ENABLE_WEBGL;
@@ -244 +245 @@
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));