Changeset 167528 in webkit


Ignore:
Timestamp:
Apr 18, 2014 10:19:30 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r167527.
​https://bugs.webkit.org/show_bug.cgi?id=131883

Broke 32-bit build (Requested by ap on #webkit).

Reverted changeset:

"[Mac] implement WebKitDataCue"
​https://bugs.webkit.org/show_bug.cgi?id=131799
​http://trac.webkit.org/changeset/167527

Location:
trunk
Files:
11 deleted
45 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r167527 r167528  
     12014-04-18  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r167527.
     4        https://bugs.webkit.org/show_bug.cgi?id=131883
     5
     6        Broke 32-bit build (Requested by ap on #webkit).
     7
     8        Reverted changeset:
     9
     10        "[Mac] implement WebKitDataCue"
     11        https://bugs.webkit.org/show_bug.cgi?id=131799
     12        http://trac.webkit.org/changeset/167527
     13
    1142014-04-18  Eric Carlson  <eric.carlson@apple.com>
    215

  • trunk/LayoutTests/platform/efl/TestExpectations

    r167527 r167528  
    14021402Bug(EFL) media/track/in-band [ Skip ]
    14031403
    1404 # DataCue.value not enabled
    1405 Bug(EFL) http/tests/media/track-in-band-hls-metadata.html [ Skip ]
    1406 Bug(EFL) media/track/track-datacue-value.html [ Skip ]
    1407 
    14081404# Rendering failure, also missing expected results:
    14091405webkit.org/b/105093 compositing/webgl/webgl-nonpremultiplied-blend.html [ Skip ]

  • trunk/LayoutTests/platform/gtk/TestExpectations

    r167527 r167528  
    339339webkit.org/b/131546 media/track/track-in-band-legacy-api.html [ Failure ]
    340340webkit.org/b/131546 media/track/track-in-band-mode.html [ Skip ]
    341 
    342 # DataCue.value not enabled
    343 Bug(GTK) http/tests/media/track-in-band-hls-metadata.html [ Skip ]
    344 Bug(GTK) media/track/track-datacue-value.html [ Skip ]
    345341
    346342# Require ENABLE(CUSTOM_ELEMENTS) support

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

    r167527 r167528  
    254254PASS Object.getOwnPropertyDescriptor(global, 'DOMTokenList').enumerable is false
    255255PASS Object.getOwnPropertyDescriptor(global, 'DOMTokenList').configurable is true
     256PASS Object.getOwnPropertyDescriptor(global, 'DataCue').value is DataCue
     257PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('get') is false
     258PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
     259PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
     260PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
    256261PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer
    257262PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false
    … …  
    19341939PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSTransformValue').enumerable is false
    19351940PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSTransformValue').configurable is true
    1936 PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').value is WebKitDataCue
    1937 PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').hasOwnProperty('get') is false
    1938 PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').hasOwnProperty('set') is false
    1939 PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').enumerable is false
    1940 PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').configurable is true
    19411941PASS Object.getOwnPropertyDescriptor(global, 'WebKitMutationObserver').value is WebKitMutationObserver
    19421942PASS Object.getOwnPropertyDescriptor(global, 'WebKitMutationObserver').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/mac/TestExpectations

    r167527 r167528  
    13391339webkit.org/b/130693 mathml/presentation/tokenElements-background-color.html [ ImageOnlyFailure ]
    13401340
    1341 # WebKitDataCue is supported, not DataCue
    1342 media/track/track-datacue.html [ Skip ]
    1343 
    1344 # Mountain Lion and prior do not support HLS timed metadata
    1345 Bug(ericcarlson) [ MountainLion ] http/tests/media/track-in-band-hls-metadata.html [ Skip ]
    1346 
    13471341# Frequently times out on EWS, which is then misreported as crash.
    13481342webkit.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

    r167527 r167528  
    254254PASS Object.getOwnPropertyDescriptor(global, 'DOMTokenList').enumerable is false
    255255PASS Object.getOwnPropertyDescriptor(global, 'DOMTokenList').configurable is true
     256PASS Object.getOwnPropertyDescriptor(global, 'DataCue').value is DataCue
     257PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('get') is false
     258PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
     259PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
     260PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
    256261PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer
    257262PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false
    … …  
    19441949PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSTransformValue').enumerable is false
    19451950PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSTransformValue').configurable is true
    1946 PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').value is WebKitDataCue
    1947 PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').hasOwnProperty('get') is false
    1948 PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').hasOwnProperty('set') is false
    1949 PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').enumerable is false
    1950 PASS Object.getOwnPropertyDescriptor(global, 'WebKitDataCue').configurable is true
    19511951PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyError').value is WebKitMediaKeyError
    19521952PASS Object.getOwnPropertyDescriptor(global, 'WebKitMediaKeyError').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/win/TestExpectations

    r167527 r167528  
    27352735platform/win/plugins/iframe-inside-overflow.html [ Failure ]
    27362736
    2737 # DataCue.value not enabled
    2738 http/tests/media/track-in-band-hls-metadata.html [ Skip ]
    2739 media/track/track-datacue-value.html [ Skip ]
    2740 
    27412737# CRASHES
    27422738ietestcenter/Javascript/15.2.3.3-4-18.html [ Crash ]

  • trunk/Source/JavaScriptCore/ChangeLog

    r167527 r167528  
     12014-04-18  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r167527.
     4        https://bugs.webkit.org/show_bug.cgi?id=131883
     5
     6        Broke 32-bit build (Requested by ap on #webkit).
     7
     8        Reverted changeset:
     9
     10        "[Mac] implement WebKitDataCue"
     11        https://bugs.webkit.org/show_bug.cgi?id=131799
     12        http://trac.webkit.org/changeset/167527
     13
    1142014-04-18  Eric Carlson  <eric.carlson@apple.com>
    215

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r167527 r167528  
    210210ENABLE_VIDEO = ENABLE_VIDEO;
    211211ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
    212 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
    213212ENABLE_VIEW_MODE_CSS_MEDIA = ;
    214213ENABLE_WEBGL = ENABLE_WEBGL;
    … …  
    245244ENABLE_LLINT_C_LOOP = ;
    246245
    247 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));
     246FEATURE_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));

  • trunk/Source/WTF/ChangeLog

    r167527 r167528  
     12014-04-18  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r167527.
     4        https://bugs.webkit.org/show_bug.cgi?id=131883
     5
     6        Broke 32-bit build (Requested by ap on #webkit).
     7
     8        Reverted changeset:
     9
     10        "[Mac] implement WebKitDataCue"
     11        https://bugs.webkit.org/show_bug.cgi?id=131799
     12        http://trac.webkit.org/changeset/167527
     13
    1142014-04-18  Eric Carlson  <eric.carlson@apple.com>
    215

  • trunk/Source/WTF/wtf/FeatureDefines.h

    r167527 r167528  
    761761#endif
    762762
    763 #if !defined(ENABLE_DATACUE_VALUE)
    764 #define ENABLE_DATACUE_VALUE 0
    765 #endif
    766 
    767763#if !defined(ENABLE_VIEWPORT)
    768764#define ENABLE_VIEWPORT 0

  • trunk/Source/WebCore/CMakeLists.txt

    r167527 r167528  
    10271027    bindings/js/JSCanvasRenderingContext2DCustom.cpp
    10281028    bindings/js/JSCanvasRenderingContextCustom.cpp
    1029     bindings/js/JSDataCueCustom.cpp
    10301029    bindings/js/JSDataTransferCustom.cpp
    10311030    bindings/js/JSCommandLineAPIHostCustom.cpp

  • trunk/Source/WebCore/ChangeLog

    r167527 r167528  
     12014-04-18  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r167527.
     4        https://bugs.webkit.org/show_bug.cgi?id=131883
     5
     6        Broke 32-bit build (Requested by ap on #webkit).
     7
     8        Reverted changeset:
     9
     10        "[Mac] implement WebKitDataCue"
     11        https://bugs.webkit.org/show_bug.cgi?id=131799
     12        http://trac.webkit.org/changeset/167527
     13
    1142014-04-18  Eric Carlson  <eric.carlson@apple.com>
    215

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r167527 r167528  
    210210ENABLE_VIDEO = ENABLE_VIDEO;
    211211ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
    212 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
    213212ENABLE_VIEW_MODE_CSS_MEDIA = ;
    214213ENABLE_WEBGL = ENABLE_WEBGL;
    … …  
    245244ENABLE_LLINT_C_LOOP = ;
    246245
    247 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));
     246FEATURE_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));

  • trunk/Source/WebCore/DerivedSources.make

    r167527 r167528  
    955955endif
    956956
    957 ifeq ($(findstring ENABLE_DATACUE_VALUE,$(FEATURE_DEFINES)), ENABLE_DATACUE_VALUE)
    958         HTML_FLAGS := $(HTML_FLAGS) ENABLE_DATACUE_VALUE=0
    959 endif
    960 
    961957ifeq ($(findstring ENABLE_ENCRYPTED_MEDIA,$(FEATURE_DEFINES)), ENABLE_ENCRYPTED_MEDIA)
    962958    HTML_FLAGS := $(HTML_FLAGS) ENABLE_ENCRYPTED_MEDIA=1

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

    r167527 r167528  
    196196                0779BF0D18453168000B6AE7 /* HTMLMediaElementMediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0779BF0A18453168000B6AE7 /* HTMLMediaElementMediaStream.cpp */; };
    197197                0779BF0E18453168000B6AE7 /* HTMLMediaElementMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 0779BF0B18453168000B6AE7 /* HTMLMediaElementMediaStream.h */; };
    198                 077AF14018F4AE400001ED61 /* SerializedPlatformRepresentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 077AF13E18F4AE400001ED61 /* SerializedPlatformRepresentation.h */; settings = {ATTRIBUTES = (Private, ); }; };
    199                 077AF14318F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 077AF14118F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h */; };
    200                 077AF14418F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 077AF14218F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm */; };
    201198                0783228418013ED800999E0C /* MediaStreamAudioSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0783228218013ED700999E0C /* MediaStreamAudioSource.cpp */; };
    202199                0783228518013ED800999E0C /* MediaStreamAudioSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 0783228318013ED800999E0C /* MediaStreamAudioSource.h */; };
    … …  
    346343                07E116B11489C9A100EC5ACE /* JSTextTrackCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E116B01489C9A100EC5ACE /* JSTextTrackCustom.cpp */; };
    347344                07E117071489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E117061489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp */; };
    348                 07E9E12E18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h in Headers */ = {isa = PBXBuildFile; fileRef = 07E9E12D18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h */; };
    349                 07E9E13018F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */; };
    350345                07ED35A216D6DCC9002248F3 /* InbandTextTrackPrivateAVFIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07357C7716D2DF0D00ED99E7 /* InbandTextTrackPrivateAVFIOS.mm */; };
    351346                07ED35A316D6DCE2002248F3 /* InbandTextTrackPrivateAVFIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 07357C7616D2DF0D00ED99E7 /* InbandTextTrackPrivateAVFIOS.h */; };
    352347                07F944161864D046005D31CB /* MediaSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAE8C081746B95700532D78 /* MediaSessionManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
    353                 07FBDE2C18FED178001A7CFF /* JSDataCueCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */; };
    354348                07FE99DC18807A7D00256648 /* HTMLMediaSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FE99DA18807A7D00256648 /* HTMLMediaSession.cpp */; };
    355349                07FE99DD18807A7D00256648 /* HTMLMediaSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 07FE99DB18807A7D00256648 /* HTMLMediaSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    70867080                0779BF0B18453168000B6AE7 /* HTMLMediaElementMediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLMediaElementMediaStream.h; sourceTree = "<group>"; };
    70877081                0779BF0C18453168000B6AE7 /* HTMLMediaElementMediaStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLMediaElementMediaStream.idl; sourceTree = "<group>"; };
    7088                 077AF13E18F4AE400001ED61 /* SerializedPlatformRepresentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedPlatformRepresentation.h; sourceTree = "<group>"; };
    7089                 077AF14118F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedPlatformRepresentationMac.h; sourceTree = "<group>"; };
    7090                 077AF14218F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SerializedPlatformRepresentationMac.mm; sourceTree = "<group>"; };
    70917082                0783228218013ED700999E0C /* MediaStreamAudioSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamAudioSource.cpp; sourceTree = "<group>"; };
    70927083                0783228318013ED800999E0C /* MediaStreamAudioSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamAudioSource.h; sourceTree = "<group>"; };
    … …  
    71757166                07E116B01489C9A100EC5ACE /* JSTextTrackCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackCustom.cpp; sourceTree = "<group>"; };
    71767167                07E117061489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackCueCustom.cpp; sourceTree = "<group>"; };
    7177                 07E9E12D18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InbandMetadataTextTrackPrivateAVF.h; sourceTree = "<group>"; };
    7178                 07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InbandMetadataTextTrackPrivateAVF.cpp; sourceTree = "<group>"; };
    7179                 07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDataCueCustom.cpp; sourceTree = "<group>"; };
    71807168                07FE99DA18807A7D00256648 /* HTMLMediaSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLMediaSession.cpp; sourceTree = "<group>"; };
    71817169                07FE99DB18807A7D00256648 /* HTMLMediaSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLMediaSession.h; sourceTree = "<group>"; };
    … …  
    1432214310                                DF9AFD6F13FC31B00015FEB7 /* objc */,
    1432314311                                CDE3A85217F5FCE600C5BE20 /* AudioTrackPrivateAVF.h */,
    14324                                 07E9E12D18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h */,
    14325                                 07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */,
    1432614312                                07B442D4166C70B000556CAD /* InbandTextTrackPrivateAVF.cpp */,
    1432714313                                07B442D5166C70B000556CAD /* InbandTextTrackPrivateAVF.h */,
    … …  
    1618116167                                1AA84F02143BA7BD0051D153 /* ScrollElasticityController.mm */,
    1618216168                                9353676A09AED88B00D35CD6 /* ScrollViewMac.mm */,
    16183                                 077AF14118F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h */,
    16184                                 077AF14218F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm */,
    1618516169                                1A4A95510B4EDCFF002D8C3C /* SharedBufferMac.mm */,
    1618616170                                93309E9F099EB78C0056E581 /* SharedTimerMac.mm */,
    … …  
    2054520529                        isa = PBXGroup;
    2054620530                        children = (
    20547                                 07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */,
    2054820531                                BC2ED6BB0C6BD2F000920BFF /* JSAttrCustom.cpp */,
    2054920532                                FDEAAAEF12B02EE400DCF33B /* JSAudioBufferSourceNodeCustom.cpp */,
    … …  
    2109121074                                BC6D6E2509AF943500F59759 /* ScrollView.h */,
    2109221075                                AB7170880B3118080017123E /* SearchPopupMenu.h */,
    21093                                 077AF13E18F4AE400001ED61 /* SerializedPlatformRepresentation.h */,
    2109421076                                1A4A954B0B4EDCCB002D8C3C /* SharedBuffer.cpp */,
    2109521077                                1A4A954C0B4EDCCB002D8C3C /* SharedBuffer.h */,
    … …  
    2297322955                                31A795C71888BCB200382F90 /* ANGLEInstancedArrays.h in Headers */,
    2297422956                                490707E71219C04300D90E51 /* ANGLEWebKitBridge.h in Headers */,
    22975                                 077AF14018F4AE400001ED61 /* SerializedPlatformRepresentation.h in Headers */,
    2297622957                                49E912AB0EFAC906009D0CAF /* Animation.h in Headers */,
    2297722958                                316FE1120E6E1DA700BF6088 /* AnimationBase.h in Headers */,
    … …  
    2305823039                                51741D0F0B07259A00ED442C /* BackForwardClient.h in Headers */,
    2305923040                                BCA8C81E11E3D36900812FB7 /* BackForwardController.h in Headers */,
    23060                                 077AF14318F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h in Headers */,
    2306123041                                BCA8CA6011E4E6D100812FB7 /* BackForwardList.h in Headers */,
    2306223042                                BC124EE80C2641CD009E2349 /* BarProp.h in Headers */,
    … …  
    2397023950                                C5D4AA7A116BAFB60069CA93 /* GlyphMetricsMap.h in Headers */,
    2397123951                                0873B86B136064EA00A522C2 /* GlyphPage.h in Headers */,
    23972                                 07E9E12E18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h in Headers */,
    2397323952                                B2C3DA6E0D006CD600EF6F26 /* GlyphPageTreeNode.h in Headers */,
    2397423953                                BC53C5F50DA56B920021EB5D /* Gradient.h in Headers */,
    … …  
    2754827527                                E44613AA0CD6331000FADA75 /* HTMLVideoElement.cpp in Sources */,
    2754927528                                0B8C56D40F28627F000502E1 /* HTTPHeaderMap.cpp in Sources */,
    27550                                 077AF14418F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.mm in Sources */,
    2755127529                                514C76720CE923A1007EF3CD /* HTTPParsers.cpp in Sources */,
    2755227530                                371A67CB11C6C7DB00047B8B /* HyphenationCF.cpp in Sources */,
    … …  
    2797727955                                CDA98E0616039E1F00FEA3B1 /* JSMediaKeySession.cpp in Sources */,
    2797827956                                BC3C39B60C0D3D8D005F4D7A /* JSMediaList.cpp in Sources */,
    27979                                 07E9E13018F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp in Sources */,
    2798027957                                D3A94A46122DC40F00A37BBC /* JSMediaQueryList.cpp in Sources */,
    2798127958                                7C5343FC17B74B63004232F0 /* JSMediaQueryListListener.cpp in Sources */,
    … …  
    2899028967                                97BC6A541505F081001B74AC /* SQLTransactionClient.cpp in Sources */,
    2899128968                                97BC6A561505F081001B74AC /* SQLTransactionCoordinator.cpp in Sources */,
    28992                                 07FBDE2C18FED178001A7CFF /* JSDataCueCustom.cpp in Sources */,
    2899328969                                FE36FD1616C7826500F887C1 /* SQLTransactionStateMachine.cpp in Sources */,
    2899428970                                97BC6A5A1505F081001B74AC /* SQLTransactionSync.cpp in Sources */,

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

    r167527 r167528  
    6262#include "JSDOMWindowShell.cpp"
    6363#include "JSDOMWrapper.cpp"
    64 #include "JSDataCueCustom.cpp"
    6564#include "JSDataTransferCustom.cpp"
    6665#include "JSDedicatedWorkerGlobalScopeCustom.cpp"

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r167527 r167528  
    13811381    if (m_readyState != HAVE_NOTHING && m_player) {
    13821382        currentCues = m_cueTree.allOverlaps(m_cueTree.createInterval(movieTime, movieTime));
    1383         if (currentCues.size() > 1)
    1384             std::sort(currentCues.begin(), currentCues.end(), &compareCueInterval);
     1383        std::sort(currentCues.begin(), currentCues.end(), &compareCueInterval);
    13851384    }
    13861385
    … …  
    14281427    // fired as part of the overall process of changing the current playback
    14291428    // position.)
    1430     if (!m_paused && m_lastSeekTime <= lastTime)
     1429    if (m_lastSeekTime <= lastTime)
    14311430        scheduleTimeupdateEvent(false);
    14321431

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

    r167527 r167528  
    11/*
    22 * Copyright (C) 2014 Cable Television Labs Inc. All rights reserved.
    3  * Copyright (C) 2014 Apple Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
    … …  
    3332#include "TextTrack.h"
    3433#include "TextTrackCueList.h"
    35 #include <runtime/Protect.h>
    3634
    3735namespace WebCore {
    3836
    39 DataCue::DataCue(ScriptExecutionContext& context, double start, double end, ArrayBuffer* data, const String& type, ExceptionCode& ec)
     37DataCue::DataCue(ScriptExecutionContext& context, double start, double end, ArrayBuffer* data, ExceptionCode& ec)
    4038    : TextTrackCue(context, start, end)
    41     , m_type(type)
    4239{
    4340    setData(data, ec);
    … …  
    5047}
    5148
    52 #if ENABLE(DATACUE_VALUE)
    53 DataCue::DataCue(ScriptExecutionContext& context, double start, double end, PassRefPtr<SerializedPlatformRepresentation> platformValue, const String& type)
    54     : TextTrackCue(context, start, end)
    55     , m_type(type)
    56     , m_platformValue(platformValue)
     49DataCue::~DataCue()
    5750{
    5851}
    5952
    60 DataCue::DataCue(ScriptExecutionContext& context, double start, double end, JSC::JSValue value, const String& type)
    61     : TextTrackCue(context, start, end)
    62     , m_type(type)
    63     , m_value(value)
     53RefPtr<ArrayBuffer> DataCue::data() const
    6454{
    65 }
    66 #endif
    67 
    68 DataCue::~DataCue()
    69 {
    70 #if ENABLE(DATACUE_VALUE)
    71     if (m_value)
    72         JSC::gcUnprotect(m_value);
    73 #endif
    74 }
    75 
    76 PassRefPtr<ArrayBuffer> DataCue::data() const
    77 {
    78 #if ENABLE(DATACUE_VALUE)
    79     if (m_platformValue)
    80         return m_platformValue->data();
    81 #endif
    82 
    83     if (!m_data)
    84         return nullptr;
    85 
     55    ASSERT_WITH_SECURITY_IMPLICATION(m_data);
    8656    return ArrayBuffer::create(m_data.get());
    8757}
    … …  
    8959void DataCue::setData(ArrayBuffer* data, ExceptionCode& ec)
    9060{
    91     if (!data) {
     61    if (!data)
    9262        ec = TypeError;
    93         return;
    94     }
    95 
    96 #if ENABLE(DATACUE_VALUE)
    97     m_platformValue = nullptr;
    98     m_value = JSC::JSValue();
    99 #endif
    100 
    101     m_data = ArrayBuffer::create(data);
     63    else
     64        m_data = ArrayBuffer::create(data);
    10265}
    10366
    104 #if !ENABLE(DATACUE_VALUE)
    10567String DataCue::text(bool& isNull) const
    10668{
    … …  
    10870    return String();
    10971}
    110 #endif
    11172
    11273DataCue* toDataCue(TextTrackCue* cue)
    … …  
    12283}
    12384
    124 bool DataCue::isEqual(const TextTrackCue& cue, TextTrackCue::CueMatchRules match) const
    125 {
    126     if (!TextTrackCue::isEqual(cue, match))
    127         return false;
    128 
    129     if (cue.cueType() != TextTrackCue::Data)
    130         return false;
    131 
    132     const DataCue* dataCue = toDataCue(&cue);
    133     RefPtr<ArrayBuffer> otherData = dataCue->data();
    134     if ((otherData && !m_data) || (!otherData && m_data))
    135         return false;
    136     if (m_data && m_data->byteLength() != otherData->byteLength())
    137         return false;
    138     if (m_data && m_data->data() && memcmp(m_data->data(), otherData->data(), m_data->byteLength()))
    139         return false;
    140 
    141 #if ENABLE(DATACUE_VALUE)
    142     RefPtr<SerializedPlatformRepresentation> otherPlatformValue = dataCue->platformValue();
    143     if ((otherPlatformValue && !m_platformValue) || (!otherPlatformValue && m_platformValue))
    144         return false;
    145     if (m_platformValue && !m_platformValue->isEqual(*otherPlatformValue.get()))
    146         return false;
    147 
    148     JSC::JSValue otherValue = dataCue->value(nullptr);
    149     if ((otherValue && !m_value) || (!otherValue && m_value))
    150         return false;
    151     if (!JSC::JSValue::strictEqual(nullptr, m_value ? m_value : JSC::JSValue(), otherValue))
    152         return false;
    153 #endif
    154 
    155     return true;
    156 }
    157 
    158 #if ENABLE(DATACUE_VALUE)
    159 JSC::JSValue DataCue::value(JSC::ExecState* exec) const
    160 {
    161     if (exec && m_platformValue)
    162         return m_platformValue->deserialize(exec);
    163 
    164     if (m_value)
    165         return m_value;
    166 
    167     return JSC::jsNull();
    168 }
    169 
    170 void DataCue::setValue(JSC::ExecState*, JSC::JSValue value)
    171 {
    172     // FIXME: this should use a SerializedScriptValue.
    173     if (m_value)
    174         JSC::gcUnprotect(m_value);
    175     m_value = value;
    176     if (m_value)
    177         JSC::gcProtect(m_value);
    178 
    179     m_platformValue = nullptr;
    180     m_data = nullptr;
    181 }
    182 #endif
    183 
    18485} // namespace WebCore
    18586

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

    r167527 r167528  
    11/*
    22 * Copyright (C) 2014 Cable Television Labs Inc. All rights reserved.
    3  * Copyright (C) 2014 Apple Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
    … …  
    3231#include "TextTrackCue.h"
    3332#include <runtime/ArrayBuffer.h>
    34 #include <runtime/JSCInlines.h>
    3533#include <wtf/RefCounted.h>
    36 
    37 #if ENABLE(DATACUE_VALUE)
    38 #include "SerializedPlatformRepresentation.h"
    39 #endif
    4034
    4135namespace WebCore {
    … …  
    4741    static PassRefPtr<DataCue> create(ScriptExecutionContext& context, double start, double end, ArrayBuffer* data, ExceptionCode& ec)
    4842    {
    49         return adoptRef(new DataCue(context, start, end, data, emptyString(), ec));
     43        return adoptRef(new DataCue(context, start, end, data, ec));
    5044    }
    5145
    … …  
    5549    }
    5650
    57     static PassRefPtr<DataCue> create(ScriptExecutionContext& context, double start, double end, ArrayBuffer* data, const String& type, ExceptionCode& ec)
    58     {
    59         return adoptRef(new DataCue(context, start, end, data, type, ec));
    60     }
    61 
    62 #if ENABLE(DATACUE_VALUE)
    63     static PassRefPtr<DataCue> create(ScriptExecutionContext& context, double start, double end, PassRefPtr<SerializedPlatformRepresentation> platformValue, const String& type)
    64     {
    65         return adoptRef(new DataCue(context, start, end, platformValue, type));
    66     }
    67 
    68     static PassRefPtr<DataCue> create(ScriptExecutionContext& context, double start, double end, JSC::JSValue value, const String& type)
    69     {
    70         return adoptRef(new DataCue(context, start, end, value, type));
    71     }
    72 #endif
    73 
    7451    virtual ~DataCue();
    7552    virtual CueType cueType() const { return Data; }
    7653
    77     PassRefPtr<ArrayBuffer> data() const;
     54    RefPtr<ArrayBuffer> data() const;
    7855    void setData(ArrayBuffer*, ExceptionCode&);
    79 
    80 #if ENABLE(DATACUE_VALUE)
    81     const PassRefPtr<SerializedPlatformRepresentation> platformValue() const { return m_platformValue; }
    82 
    83     JSC::JSValue value(JSC::ExecState*) const;
    84     void setValue(JSC::ExecState*, JSC::JSValue);
    85 
    86     String type() const { return m_type; }
    87     void setType(const String& type) { m_type = type; }
    88 #else
    89     String text(bool&) const;
    90 #endif
    91 
    92     virtual bool isEqual(const TextTrackCue&, CueMatchRules) const override;
     56    String text(bool& isNull) const;
    9357
    9458protected:
    95     DataCue(ScriptExecutionContext&, double start, double end, ArrayBuffer*, const String&, ExceptionCode&);
    96     DataCue(ScriptExecutionContext&, double start, double end, const void*, unsigned);
    97 #if ENABLE(DATACUE_VALUE)
    98     DataCue(ScriptExecutionContext&, double start, double end, PassRefPtr<SerializedPlatformRepresentation>, const String&);
    99     DataCue(ScriptExecutionContext&, double start, double end, JSC::JSValue, const String&);
    100 #endif
     59    DataCue(ScriptExecutionContext&, double start, double end, ArrayBuffer*, ExceptionCode&);
     60    DataCue(ScriptExecutionContext&, double start, double end, const void* data, unsigned length);
    10161
    10262private:
    10363    RefPtr<ArrayBuffer> m_data;
    104     String m_type;
    105 #if ENABLE(DATACUE_VALUE)
    106     RefPtr<SerializedPlatformRepresentation> m_platformValue;
    107     JSC::JSValue m_value;
    108 #endif
    10964};
    11065

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

    r167527 r167528  
    11/*
    22 * Copyright (C) 2014 Cable Television Labs Inc.  All rights reserved.
    3  * Copyright (C) 2014 Apple Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
    … …  
    2625[
    2726    Conditional=VIDEO_TRACK,
    28     CustomConstructor,
    29 #if defined(ENABLE_DATACUE_VALUE) && ENABLE_DATACUE_VALUE
    30     CustomConstructor(double startTime, double endTime, any value, optional DOMString type),
    31     InterfaceName=WebKitDataCue,
    32 #else
    33     CustomConstructor(double startTime, double endTime, ArrayBuffer data),
    34 #endif
     27    Constructor(double startTime, double endTime, [StrictTypeChecking] ArrayBuffer data),
     28    ConstructorCallWith=ScriptExecutionContext,
    3529    ConstructorRaisesException,
    3630] interface DataCue : TextTrackCue {
    3731    [SetterRaisesException] attribute ArrayBuffer data;
    38 
    39 #if defined(ENABLE_DATACUE_VALUE) && ENABLE_DATACUE_VALUE
    40     [CustomGetter, CustomSetter] attribute any value;
    41     readonly attribute DOMString type;
    42 #else
    4332    readonly attribute DOMString? text;
    44 #endif
    4533};

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

    r167527 r167528  
    11/*
    22 * Copyright (C) 2014 Cable Television Labs Inc.  All rights reserved.
    3  * Copyright (C) 2014 Apple Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
    … …  
    3231#include "DataCue.h"
    3332#include "ExceptionCodePlaceholder.h"
    34 #include "HTMLMediaElement.h"
    3533#include "InbandTextTrackPrivate.h"
    36 #include "Logging.h"
    3734#include <runtime/ArrayBuffer.h>
    3835
    … …  
    5956}
    6057
    61 #if ENABLE(DATACUE_VALUE)
    62 void InbandDataTextTrack::addDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation> prpPlatformValue, const String& type)
    63 {
    64     RefPtr<SerializedPlatformRepresentation> platformValue = prpPlatformValue;
    65     if (m_incompleteCueMap.find(platformValue.get()) != m_incompleteCueMap.end())
    66         return;
    67 
    68     RefPtr<DataCue> cue = DataCue::create(*scriptExecutionContext(), start, end, platformValue, type);
    69     if (hasCue(cue.get(), TextTrackCue::IgnoreDuration)) {
    70         LOG(Media, "InbandDataTextTrack::addDataCue ignoring already added cue: start=%.2f, end=%.2f\n", cue->startTime(), cue->endTime());
    71         return;
    72     }
    73 
    74     if (std::isinf(end) && mediaElement()) {
    75         cue->setEndTime(mediaElement()->duration(), IGNORE_EXCEPTION);
    76         m_incompleteCueMap.add(platformValue, cue);
    77     }
    78 
    79     addCue(cue.release(), ASSERT_NO_EXCEPTION);
    80 }
    81 
    82 void InbandDataTextTrack::updateDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation> prpPlatformValue)
    83 {
    84     RefPtr<SerializedPlatformRepresentation> platformValue = prpPlatformValue;
    85     auto iter = m_incompleteCueMap.find(platformValue.get());
    86     if (iter == m_incompleteCueMap.end())
    87         return;
    88 
    89     RefPtr<DataCue> cue = iter->value;
    90     if (!cue)
    91         return;
    92 
    93     cue->willChange();
    94 
    95     if (std::isinf(end) && mediaElement())
    96         end = mediaElement()->duration();
    97     else
    98         m_incompleteCueMap.remove(platformValue.get());
    99 
    100     LOG(Media, "InbandDataTextTrack::updateDataCue: was start=%.2f, end=%.2f, will be start=%.2f, end=%.2f\n", cue->startTime(), cue->endTime(), start, end);
    101 
    102     cue->setStartTime(start, IGNORE_EXCEPTION);
    103     cue->setEndTime(end, IGNORE_EXCEPTION);
    104 
    105     cue->didChange();
    106 }
    107 
    108 void InbandDataTextTrack::removeDataCue(InbandTextTrackPrivate*, double, double, PassRefPtr<SerializedPlatformRepresentation> prpPlatformValue)
    109 {
    110     RefPtr<SerializedPlatformRepresentation> platformValue = prpPlatformValue;
    111     auto iter = m_incompleteCueMap.find(platformValue.get());
    112     if (iter == m_incompleteCueMap.end())
    113         return;
    114 
    115     RefPtr<DataCue> cue = iter->value;
    116     if (cue) {
    117         LOG(Media, "InbandDataTextTrack::removeDataCue removing cue: start=%.2f, end=%.2f\n", cue->startTime(), cue->endTime());
    118         removeCue(cue.get(), IGNORE_EXCEPTION);
    119     }
    120 }
    121 
    122 void InbandDataTextTrack::removeCue(TextTrackCue* cue, ExceptionCode& ec)
    123 {
    124     ASSERT(cue->cueType() == TextTrackCue::Data);
    125 
    126     RefPtr<SerializedPlatformRepresentation> platformValue = toDataCue(cue)->platformValue().get();
    127     auto iter = m_incompleteCueMap.find(platformValue.get());
    128     if (iter != m_incompleteCueMap.end())
    129         m_incompleteCueMap.remove(platformValue.get());
    130 
    131     InbandTextTrack::removeCue(cue, ec);
    132 }
    133 
    134 #endif
    135 
    13658} // namespace WebCore
    13759

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

    r167527 r167528  
    11/*
    22 * Copyright (C) 2014 Cable Television Labs Inc. All rights reserved.
    3  * Copyright (C) 2014 Apple Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
    … …  
    3534namespace WebCore {
    3635
    37 class DataCue;
    3836class Document;
    3937class InbandTextTrackPrivate;
    40 
    41 #if ENABLE(DATACUE_VALUE)
    42 class SerializedPlatformRepresentation;
    43 #endif
     38class TextTrackCue;
    4439
    4540class InbandDataTextTrack : public InbandTextTrack {
    … …  
    5247
    5348    virtual void addDataCue(InbandTextTrackPrivate*, double start, double end, const void*, unsigned) override;
    54 
    55 #if ENABLE(DATACUE_VALUE)
    56     virtual void addDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation>, const String&) override;
    57     virtual void updateDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation>) override;
    58     virtual void removeDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation>) override;
    59     virtual void removeCue(TextTrackCue*, ExceptionCode&) override;
    60 
    61     HashMap<RefPtr<SerializedPlatformRepresentation>, RefPtr<DataCue>> m_incompleteCueMap;
    62 #endif
    6349};
    6450

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

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

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

    r167527 r167528  
    7272    virtual void addDataCue(InbandTextTrackPrivate*, double, double, const void*, unsigned) override { ASSERT_NOT_REACHED(); }
    7373
    74 #if ENABLE(DATACUE_VALUE)
    75     virtual void addDataCue(InbandTextTrackPrivate*, double, double, PassRefPtr<SerializedPlatformRepresentation>, const String&) override { ASSERT_NOT_REACHED(); }
    76     virtual void updateDataCue(InbandTextTrackPrivate*, double, double, PassRefPtr<SerializedPlatformRepresentation>) override  { ASSERT_NOT_REACHED(); }
    77     virtual void removeDataCue(InbandTextTrackPrivate*, double, double, PassRefPtr<SerializedPlatformRepresentation>) override  { ASSERT_NOT_REACHED(); }
    78 #endif
    79 
    8074    virtual void addGenericCue(InbandTextTrackPrivate*, PassRefPtr<GenericCueData>) override { ASSERT_NOT_REACHED(); }
    8175    virtual void updateGenericCue(InbandTextTrackPrivate*, GenericCueData*) override { ASSERT_NOT_REACHED(); }

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

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

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

    r167527 r167528  
    484484}
    485485
    486 bool TextTrack::hasCue(TextTrackCue* cue, TextTrackCue::CueMatchRules match)
     486bool TextTrack::hasCue(VTTCue* cue, VTTCue::CueMatchRules match)
    487487{
    488488    if (cue->startTime() < 0 || cue->endTime() < 0)
    … …  
    520520
    521521                existingCue = m_cues->item(searchStart - 1);
     522                if (!cue->isRenderable())
     523                    continue;
     524
    522525                if (!existingCue || cue->startTime() > existingCue->startTime())
    523526                    return false;
    524527
    525                 if (!existingCue->isEqual(*cue, match))
     528                if (!toVTTCue(existingCue)->isEqual(*cue, match))
    526529                    continue;
    527530               
    … …  
    532535        size_t index = (searchStart + searchEnd) / 2;
    533536        existingCue = m_cues->item(index);
    534         if (cue->startTime() < existingCue->startTime() || (match != TextTrackCue::IgnoreDuration && cue->startTime() == existingCue->startTime() && cue->endTime() > existingCue->endTime()))
     537        if (cue->startTime() < existingCue->startTime() || (match != VTTCue::IgnoreDuration && cue->startTime() == existingCue->startTime() && cue->endTime() > existingCue->endTime()))
    535538            searchEnd = index;
    536539        else

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

    r167527 r167528  
    113113    virtual void removeCue(TextTrackCue*, ExceptionCode&);
    114114
    115     bool hasCue(TextTrackCue*, TextTrackCue::CueMatchRules = TextTrackCue::MatchAllFields);
     115    bool hasCue(VTTCue*, VTTCue::CueMatchRules = VTTCue::MatchAllFields);
    116116
    117117#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)

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

    r167527 r167528  
    203203}
    204204
    205 bool TextTrackCue::isEqual(const TextTrackCue& cue, TextTrackCue::CueMatchRules match) const
    206 {
    207     if (cueType() != cue.cueType())
    208         return false;
    209 
    210     if (match != IgnoreDuration && endTime() != cue.endTime())
    211         return false;
    212     if (startTime() != cue.startTime())
    213         return false;
    214     if (id() != cue.id())
    215         return false;
    216 
    217     return true;
    218 }
    219 
    220205} // namespace WebCore
    221206

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

    r167527 r167528  
    9292    virtual bool isRenderable() const { return false; }
    9393
    94     enum CueMatchRules {
    95         MatchAllFields,
    96         IgnoreDuration,
    97     };
    98     virtual bool isEqual(const TextTrackCue&, CueMatchRules) const;
    99 
    10094    void willChange();
    10195    virtual void didChange();

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

    r167527 r167528  
    152152}
    153153   
    154 bool TextTrackCueGeneric::isEqual(const TextTrackCue& cue, TextTrackCue::CueMatchRules match) const
     154bool TextTrackCueGeneric::isEqual(const VTTCue& cue, VTTCue::CueMatchRules match) const
    155155{
    156     if (!TextTrackCue::isEqual(cue, match))
    157         return false;
    158 
    159156    if (cue.cueType() != TextTrackCue::Generic)
    160157        return false;

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

    r167527 r167528  
    7373    virtual void setFontSize(int, const IntSize&, bool important) override;
    7474
    75     virtual bool isEqual(const TextTrackCue&, CueMatchRules) const override;
     75    virtual bool isEqual(const VTTCue&, CueMatchRules) const override;
    7676
    7777    virtual TextTrackCue::CueType cueType() const override { return TextTrackCue::Generic; }

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

    r167527 r167528  
    10631063}
    10641064
    1065 bool VTTCue::isEqual(const TextTrackCue& cue, TextTrackCue::CueMatchRules match) const
    1066 {
    1067     if (!TextTrackCue::isEqual(cue, match))
     1065bool VTTCue::isEqual(const VTTCue& cue, CueMatchRules match) const
     1066{
     1067    if (cueType() != cue.cueType())
    10681068        return false;
    1069 
    1070     if (cue.cueType() != WebVTT)
     1069   
     1070    if (match != IgnoreDuration && endTime() != cue.endTime())
    10711071        return false;
    1072 
    1073     const VTTCue* vttCue = toVTTCue(&cue);
    1074     if (text() != vttCue->text())
     1072    if (startTime() != cue.startTime())
    10751073        return false;
    1076     if (cueSettings() != vttCue->cueSettings())
     1074    if (text() != cue.text())
    10771075        return false;
    1078     if (position() != vttCue->position())
     1076    if (cueSettings() != cue.cueSettings())
    10791077        return false;
    1080     if (line() != vttCue->line())
     1078    if (id() != cue.id())
    10811079        return false;
    1082     if (size() != vttCue->size())
     1080    if (position() != cue.position())
    10831081        return false;
    1084     if (align() != vttCue->align())
     1082    if (line() != cue.line())
     1083        return false;
     1084    if (size() != cue.size())
     1085        return false;
     1086    if (align() != cue.align())
    10851087        return false;
    10861088   

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

    r167527 r167528  
    154154    virtual void setFontSize(int, const IntSize&, bool important);
    155155
    156     virtual bool isEqual(const TextTrackCue&, CueMatchRules) const override;
     156    enum CueMatchRules {
     157        MatchAllFields,
     158        IgnoreDuration,
     159    };
     160    virtual bool isEqual(const VTTCue&, CueMatchRules) const;
    157161
    158162    virtual CueType cueType() const { return WebVTT; }

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

    r167527 r167528  
    2929#include "Color.h"
    3030#include "TrackPrivateBase.h"
    31 
    32 #if ENABLE(DATACUE_VALUE)
    33 #include "SerializedPlatformRepresentation.h"
    34 #endif
    3531
    3632#if ENABLE(VIDEO_TRACK)
    … …  
    133129};
    134130
     131class WebVTTCueData;
     132
    135133class InbandTextTrackPrivateClient : public TrackPrivateBaseClient {
    136134public:
    … …  
    138136
    139137    virtual void addDataCue(InbandTextTrackPrivate*, double start, double end, const void*, unsigned) = 0;
    140 
    141 #if ENABLE(DATACUE_VALUE)
    142     virtual void addDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation>, const String&) = 0;
    143     virtual void updateDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation>) = 0;
    144     virtual void removeDataCue(InbandTextTrackPrivate*, double start, double end, PassRefPtr<SerializedPlatformRepresentation>) = 0;
    145 #endif
    146138
    147139    virtual void addGenericCue(InbandTextTrackPrivate*, PassRefPtr<GenericCueData>) = 0;

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

    r167527 r167528  
    282282        return;
    283283
    284     if (currentTextTrack())
    285         currentTextTrack()->beginSeeking();
    286 
     284    if (currentTrack())
     285        currentTrack()->beginSeeking();
     286   
    287287    LOG(Media, "MediaPlayerPrivateAVFoundation::seek(%p) - seeking to %f", this, time);
    288288
    … …  
    660660    }
    661661
    662     if (currentTextTrack())
    663         currentTextTrack()->endSeeking();
     662    if (currentTrack())
     663        currentTrack()->endSeeking();
    664664
    665665    updateStates();
    … …  
    930930    }
    931931
    932     setCurrentTextTrack(trackToEnable.get());
     932    setCurrentTrack(trackToEnable.get());
    933933}
    934934

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

    r167527 r167528  
    4040namespace WebCore {
    4141
    42 class InbandMetadataTextTrackPrivateAVF;
    4342class InbandTextTrackPrivateAVF;
    4443class GenericCueData;
    … …  
    5958    virtual void contentsNeedsDisplay() { }
    6059    virtual void configureInbandTracks();
    61     virtual void setCurrentTextTrack(InbandTextTrackPrivateAVF*) { }
    62     virtual InbandTextTrackPrivateAVF* currentTextTrack() const = 0;
     60    virtual void setCurrentTrack(InbandTextTrackPrivateAVF*) { }
     61    virtual InbandTextTrackPrivateAVF* currentTrack() const = 0;
    6362#if ENABLE(IOS_AIRPLAY)
    6463    void playbackTargetIsWirelessChanged();
    … …  
    303302    void clearTextTracks();
    304303    Vector<RefPtr<InbandTextTrackPrivateAVF>> m_textTracks;
    305 
     304   
    306305private:
    307306    MediaPlayer* m_player;

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

    r167527 r167528  
    111111    void updateVideoLayerGravity();
    112112
    113     void setCurrentTextTrack(InbandTextTrackPrivateAVF*);
    114     InbandTextTrackPrivateAVF* currentTextTrack() const { return m_currentTextTrack; }
     113    void setCurrentTrack(InbandTextTrackPrivateAVF*);
     114    InbandTextTrackPrivateAVF* currentTrack() const { return m_currentTrack; }
    115115
    116116#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP) && HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
    … …  
    171171    COMPtr<IDirect3DDevice9Ex> m_d3dDevice;
    172172
    173     InbandTextTrackPrivateAVF* m_currentTextTrack;
     173    InbandTextTrackPrivateAVF* m_currentTrack;
    174174};
    175175
    … …  
    393393}
    394394
    395 void MediaPlayerPrivateAVFoundationCF::setCurrentTextTrack(InbandTextTrackPrivateAVF* track)
     395void MediaPlayerPrivateAVFoundationCF::setCurrentTrack(InbandTextTrackPrivateAVF* track)
    396396{
    397397    if (m_avfWrapper)
    398         m_avfWrapper->setCurrentTextTrack(track);
    399 }
    400 
    401 InbandTextTrackPrivateAVF* MediaPlayerPrivateAVFoundationCF::currentTextTrack() const
     398        m_avfWrapper->setCurrentTrack(track);
     399}
     400
     401InbandTextTrackPrivateAVF* MediaPlayerPrivateAVFoundationCF::currentTrack() const
    402402{
    403403    if (m_avfWrapper)
    404         return m_avfWrapper->currentTextTrack();
     404        return m_avfWrapper->currentTrack();
    405405
    406406    return 0;
    … …  
    11031103#endif // HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
    11041104
    1105 void AVFWrapper::setCurrentTextTrack(InbandTextTrackPrivateAVF* track)
    1106 {
    1107     if (m_currentTextTrack == track)
    1108         return;
    1109 
    1110     LOG(Media, "MediaPlayerPrivateAVFoundationCF::setCurrentTextTrack(%p) - selecting track %p, language = %s", this, track, track ? track->language().string().utf8().data() : "");
     1105void AVFWrapper::setCurrentTrack(InbandTextTrackPrivateAVF* track)
     1106{
     1107    if (m_currentTrack == track)
     1108        return;
     1109
     1110    LOG(Media, "MediaPlayerPrivateAVFoundationCF::setCurrentTrack(%p) - selecting track %p, language = %s", this, track, track ? track->language().string().utf8().data() : "");
    11111111       
    1112     m_currentTextTrack = track;
     1112    m_currentTrack = track;
    11131113
    11141114    if (track) {
    … …  
    11881188    : m_owner(owner)
    11891189    , m_objectID(s_nextAVFWrapperObjectID++)
    1190     , m_currentTextTrack(0)
     1190    , m_currentTrack(0)
    11911191{
    11921192    ASSERT(isMainThread());
    … …  
    16221622    }
    16231623
    1624     if (!self->m_currentTextTrack)
    1625         return;
    1626 
    1627     self->m_currentTextTrack->processCue(legibleOutputData->m_attributedStrings.get(), legibleOutputData->m_time);
     1624    if (!self->m_currentTrack)
     1625        return;
     1626
     1627    self->m_currentTrack->processCue(legibleOutputData->m_attributedStrings.get(), legibleOutputData->m_time);
    16281628}
    16291629

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

    r167527 r167528  
    109109#endif
    110110
    111     virtual void setCurrentTextTrack(InbandTextTrackPrivateAVF*) override;
    112     virtual InbandTextTrackPrivateAVF* currentTextTrack() const override;
     111    virtual void setCurrentTrack(InbandTextTrackPrivateAVF*) override;
     112    virtual InbandTextTrackPrivateAVF* currentTrack() const override;
    113113
    114114#if !HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)

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

    r167527 r167528  
    6161
    6262class WebCoreAVFResourceLoader;
    63 class InbandMetadataTextTrackPrivateAVF;
    6463class InbandTextTrackPrivateAVFObjC;
    6564class AudioTrackPrivateAVFObjC;
    … …  
    110109    void durationDidChange(double);
    111110    void rateDidChange(double);
    112     void metadataDidArrive(RetainPtr<NSArray>, double);
     111    void metadataDidArrive(RetainPtr<NSArray>);
    113112
    114113#if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
    … …  
    237236#endif
    238237
    239 #if ENABLE(DATACUE_VALUE)
    240     void processMetadataTrack();
    241 #endif
    242 
    243     virtual void setCurrentTextTrack(InbandTextTrackPrivateAVF*) override;
    244     virtual InbandTextTrackPrivateAVF* currentTextTrack() const override { return m_currentTextTrack; }
     238    virtual void setCurrentTrack(InbandTextTrackPrivateAVF*) override;
     239    virtual InbandTextTrackPrivateAVF* currentTrack() const override { return m_currentTrack; }
    245240
    246241#if !HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
    … …  
    308303#endif
    309304
    310     InbandTextTrackPrivateAVF* m_currentTextTrack;
    311 
    312 #if ENABLE(DATACUE_VALUE)
    313     RefPtr<InbandMetadataTextTrackPrivateAVF> m_metadataTrack;
    314 #endif
     305    InbandTextTrackPrivateAVF* m_currentTrack;
    315306
    316307    mutable RetainPtr<NSArray> m_cachedSeekableRanges;

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

    r167527 r167528  
    2727
    2828#if ENABLE(VIDEO) && USE(AVFOUNDATION)
     29
    2930#import "MediaPlayerPrivateAVFoundationObjC.h"
    3031
    … …  
    4041#import "GraphicsContext.h"
    4142#import "GraphicsContextCG.h"
    42 #import "InbandMetadataTextTrackPrivateAVF.h"
    4343#import "InbandTextTrackPrivateAVFObjC.h"
    4444#import "InbandTextTrackPrivateLegacyAVFObjC.h"
    … …  
    4848#import "PlatformTimeRanges.h"
    4949#import "SecurityOrigin.h"
    50 #import "SerializedPlatformRepresentationMac.h"
    5150#import "SoftLinking.h"
    5251#import "TextTrackRepresentation.h"
    … …  
    6463#import <wtf/CurrentTime.h>
    6564#import <wtf/Functional.h>
    66 #import <wtf/NeverDestroyed.h>
    6765#import <wtf/text/CString.h>
    6866#import <wtf/text/StringBuilder.h>
    … …  
    10199#endif
    102100
    103 typedef AVPlayerItem AVPlayerItemType;
    104101typedef AVMetadataItem AVMetadataItemType;
    105102
    … …  
    148145SOFT_LINK_POINTER(AVFoundation, AVMediaTypeVideo, NSString *)
    149146SOFT_LINK_POINTER(AVFoundation, AVMediaTypeAudio, NSString *)
    150 SOFT_LINK_POINTER(AVFoundation, AVMediaTypeMetadata, NSString *)
    151147SOFT_LINK_POINTER(AVFoundation, AVPlayerItemDidPlayToEndTimeNotification, NSString *)
    152148SOFT_LINK_POINTER(AVFoundation, AVURLAssetInheritURIQueryComponentFromReferencingURIKey, NSString *)
    … …  
    172168#define AVMediaTypeVideo getAVMediaTypeVideo()
    173169#define AVMediaTypeAudio getAVMediaTypeAudio()
    174 #define AVMediaTypeMetadata getAVMediaTypeMetadata()
    175170#define AVPlayerItemDidPlayToEndTimeNotification getAVPlayerItemDidPlayToEndTimeNotification()
    176171#define AVURLAssetInheritURIQueryComponentFromReferencingURIKey getAVURLAssetInheritURIQueryComponentFromReferencingURIKey()
    … …  
    226221#endif
    227222
    228 #if ENABLE(DATACUE_VALUE)
    229 SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceQuickTimeUserData, NSString*)
    230 SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceISOUserData, NSString*)
    231 SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceQuickTimeMetadata, NSString*)
    232 SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceiTunes, NSString*)
    233 SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceID3, NSString*)
    234 
    235 #define AVMetadataKeySpaceQuickTimeUserData getAVMetadataKeySpaceQuickTimeUserData()
    236 #define AVMetadataKeySpaceISOUserData getAVMetadataKeySpaceISOUserData()
    237 #define AVMetadataKeySpaceQuickTimeMetadata getAVMetadataKeySpaceQuickTimeMetadata()
    238 #define AVMetadataKeySpaceiTunes getAVMetadataKeySpaceiTunes()
    239 #define AVMetadataKeySpaceID3 getAVMetadataKeySpaceID3()
    240 #endif
    241 
    242223#define kCMTimeZero getkCMTimeZero()
    243224
    … …  
    363344    , m_loaderDelegate(adoptNS([[WebCoreAVFLoaderDelegate alloc] initWithCallback:this]))
    364345#endif
    365     , m_currentTextTrack(0)
     346    , m_currentTrack(0)
    366347    , m_cachedDuration(MediaPlayer::invalidTime())
    367348    , m_cachedRate(0)
    … …  
    987968    setDelayCallbacks(true);
    988969
    989     if (m_metadataTrack)
    990         m_metadataTrack->flushPartialCues();
    991 
    992970    CMTime cmTime = CMTimeMakeWithSeconds(time, 600);
    993971    CMTime cmBefore = CMTimeMakeWithSeconds(negativeTolerance, 600);
    … …  
    14401418        bool hasVideo = false;
    14411419        bool hasAudio = false;
    1442         bool hasMetaData = false;
    14431420        for (AVPlayerItemTrack *track in m_cachedTracks.get()) {
    14441421            if ([track isEnabled]) {
    14451422                AVAssetTrack *assetTrack = [track assetTrack];
    1446                 NSString *mediaType = [assetTrack mediaType];
    1447                 if ([mediaType isEqualToString:AVMediaTypeVideo])
     1423                if ([[assetTrack mediaType] isEqualToString:AVMediaTypeVideo])
    14481424                    hasVideo = true;
    1449                 else if ([mediaType isEqualToString:AVMediaTypeAudio])
     1425                else if ([[assetTrack mediaType] isEqualToString:AVMediaTypeAudio])
    14501426                    hasAudio = true;
    1451                 else if ([mediaType isEqualToString:AVMediaTypeClosedCaption]) {
     1427                else if ([[assetTrack mediaType] isEqualToString:AVMediaTypeClosedCaption]) {
    14521428#if !HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
    14531429                    hasCaptions = true;
    14541430#endif
    14551431                    haveCCTrack = true;
    1456                 } else if ([mediaType isEqualToString:AVMediaTypeMetadata]) {
    1457                     hasMetaData = true;
    14581432                }
    14591433            }
    14601434        }
    1461 
    14621435        setHasVideo(hasVideo);
    14631436        setHasAudio(hasAudio);
    1464 #if ENABLE(DATACUE_VALUE)
    1465         if (hasMetaData)
    1466             processMetadataTrack();
    1467 #endif
     1437
    14681438
    14691439#if ENABLE(VIDEO_TRACK)
    … …  
    20482018}
    20492019
    2050 void MediaPlayerPrivateAVFoundationObjC::processMetadataTrack()
    2051 {
    2052     if (m_metadataTrack)
    2053         return;
    2054 
    2055     m_metadataTrack = InbandMetadataTextTrackPrivateAVF::create(InbandTextTrackPrivate::Metadata, InbandTextTrackPrivate::Data);
    2056     m_metadataTrack->setInBandMetadataTrackDispatchType("com.apple.streaming");
    2057     player()->addTextTrack(m_metadataTrack);
    2058 }
    2059 
    20602020void MediaPlayerPrivateAVFoundationObjC::processCue(NSArray *attributedStrings, double time)
    20612021{
    2062     if (!m_currentTextTrack)
    2063         return;
    2064 
    2065     m_currentTextTrack->processCue(reinterpret_cast<CFArrayRef>(attributedStrings), time);
     2022    if (!m_currentTrack)
     2023        return;
     2024
     2025    m_currentTrack->processCue(reinterpret_cast<CFArrayRef>(attributedStrings), time);
    20662026}
    20672027
    … …  
    20702030    LOG(Media, "MediaPlayerPrivateAVFoundationObjC::flushCues(%p)", this);
    20712031
    2072     if (!m_currentTextTrack)
     2032    if (!m_currentTrack)
    20732033        return;
    20742034   
    2075     m_currentTextTrack->resetCueValues();
     2035    m_currentTrack->resetCueValues();
    20762036}
    20772037#endif // HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
    20782038
    2079 void MediaPlayerPrivateAVFoundationObjC::setCurrentTextTrack(InbandTextTrackPrivateAVF *track)
    2080 {
    2081     if (m_currentTextTrack == track)
    2082         return;
    2083 
    2084     LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setCurrentTextTrack(%p) - selecting track %p, language = %s", this, track, track ? track->language().string().utf8().data() : "");
     2039void MediaPlayerPrivateAVFoundationObjC::setCurrentTrack(InbandTextTrackPrivateAVF *track)
     2040{
     2041    if (m_currentTrack == track)
     2042        return;
     2043
     2044    LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setCurrentTrack(%p) - selecting track %p, language = %s", this, track, track ? track->language().string().utf8().data() : "");
    20852045       
    2086     m_currentTextTrack = track;
     2046    m_currentTrack = track;
    20872047
    20882048    if (track) {
    … …  
    22752235}
    22762236
    2277 #if ENABLE(DATACUE_VALUE)
    2278 static const AtomicString& metadataType(NSString *avMetadataKeySpace)
    2279 {
    2280     static NeverDestroyed<const AtomicString> quickTimeUserData("com.apple.quicktime.udta", AtomicString::ConstructFromLiteral);
    2281     static NeverDestroyed<const AtomicString> isoUserData("org.mp4ra", AtomicString::ConstructFromLiteral);
    2282     static NeverDestroyed<const AtomicString> quickTimeMetadata("com.apple.quicktime.mdta", AtomicString::ConstructFromLiteral);
    2283     static NeverDestroyed<const AtomicString> iTunesMetadata("com.apple.itunes", AtomicString::ConstructFromLiteral);
    2284     static NeverDestroyed<const AtomicString> id3Metadata("org.id3", AtomicString::ConstructFromLiteral);
    2285 
    2286     if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceQuickTimeUserData])
    2287         return quickTimeUserData;
    2288     if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceISOUserData])
    2289         return isoUserData;
    2290     if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceQuickTimeMetadata])
    2291         return quickTimeMetadata;
    2292     if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceiTunes])
    2293         return iTunesMetadata;
    2294     if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceID3])
    2295         return id3Metadata;
    2296 
    2297     return emptyAtom;
    2298 }
    2299 #endif
    2300 
    2301 void MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(RetainPtr<NSArray> metadata, double mediaTime)
    2302 {
    2303     m_currentMetaData = metadata && ![metadata isKindOfClass:[NSNull class]] ? metadata : nil;
    2304 
    2305     LOG(Media, "MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(%p) - adding %i cues at time %.2f", this, m_currentMetaData ? [m_currentMetaData.get() count] : 0, mediaTime);
    2306 
    2307 #if ENABLE(DATACUE_VALUE)
    2308     if (seeking())
    2309         return;
    2310 
    2311     if (!metadata || [metadata isKindOfClass:[NSNull class]]) {
    2312         m_metadataTrack->updatePendingCueEndTimes(mediaTime);
    2313         return;
    2314     }
    2315 
    2316     if (!m_metadataTrack)
    2317         processMetadataTrack();
    2318 
    2319     // Set the duration of all incomplete cues before adding new ones.
    2320     double earliesStartTime = std::numeric_limits<double>::infinity();
    2321     for (AVMetadataItemType *item in m_currentMetaData.get()) {
    2322         double start = CMTimeGetSeconds(item.time);
    2323         if (start < earliesStartTime)
    2324             earliesStartTime = start;
    2325     }
    2326     m_metadataTrack->updatePendingCueEndTimes(earliesStartTime);
    2327 
    2328     for (AVMetadataItemType *item in m_currentMetaData.get()) {
    2329         double start = CMTimeGetSeconds(item.time);
    2330         double end = std::numeric_limits<double>::infinity();
    2331         if (CMTIME_IS_VALID(item.duration))
    2332             end = start + CMTimeGetSeconds(item.duration);
    2333 
    2334         AtomicString type = nullAtom;
    2335         if (item.keySpace)
    2336             type = metadataType(item.keySpace);
    2337 
    2338         m_metadataTrack->addDataCue(start, end, SerializedPlatformRepresentationMac::create(item), type);
    2339     }
    2340 #endif
     2237void MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(RetainPtr<NSArray> metadata)
     2238{
     2239    if (!metadata || [metadata isKindOfClass:[NSNull class]])
     2240        return;
     2241
     2242    m_currentMetaData = metadata;
    23412243}
    23422244
    … …  
    25072409        else if ([keyPath isEqualToString:@"duration"])
    25082410            function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::durationDidChange, m_callback, CMTimeGetSeconds([newValue CMTimeValue]));
    2509         else if ([keyPath isEqualToString:@"timedMetadata"] && newValue) {
    2510             double now = 0;
    2511             CMTime itemTime = [(AVPlayerItemType *)object currentTime];
    2512             if (CMTIME_IS_NUMERIC(itemTime))
    2513                 now = std::max(narrowPrecisionToFloat(CMTimeGetSeconds(itemTime)), 0.0f);
    2514             function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::metadataDidArrive, m_callback, RetainPtr<NSArray>(newValue), now);
    2515         }
     2411        else if ([keyPath isEqualToString:@"timedMetadata"] && newValue)
     2412            function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::metadataDidArrive, m_callback, RetainPtr<NSArray>(newValue));
    25162413    }
    25172414

  • trunk/Source/WebKit/mac/ChangeLog

    r167527 r167528  
     12014-04-18  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r167527.
     4        https://bugs.webkit.org/show_bug.cgi?id=131883
     5
     6        Broke 32-bit build (Requested by ap on #webkit).
     7
     8        Reverted changeset:
     9
     10        "[Mac] implement WebKitDataCue"
     11        https://bugs.webkit.org/show_bug.cgi?id=131799
     12        http://trac.webkit.org/changeset/167527
     13
    1142014-04-18  Eric Carlson  <eric.carlson@apple.com>
    215

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

    r167527 r167528  
    210210ENABLE_VIDEO = ENABLE_VIDEO;
    211211ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
    212 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
    213212ENABLE_VIEW_MODE_CSS_MEDIA = ;
    214213ENABLE_WEBGL = ENABLE_WEBGL;
    … …  
    245244ENABLE_LLINT_C_LOOP = ;
    246245
    247 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));
     246FEATURE_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));

  • trunk/Source/WebKit2/ChangeLog

    r167527 r167528  
     12014-04-18  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r167527.
     4        https://bugs.webkit.org/show_bug.cgi?id=131883
     5
     6        Broke 32-bit build (Requested by ap on #webkit).
     7
     8        Reverted changeset:
     9
     10        "[Mac] implement WebKitDataCue"
     11        https://bugs.webkit.org/show_bug.cgi?id=131799
     12        http://trac.webkit.org/changeset/167527
     13
    1142014-04-18  Eric Carlson  <eric.carlson@apple.com>
    215

  • trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

    r167527 r167528  
    210210ENABLE_VIDEO = ENABLE_VIDEO;
    211211ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
    212 ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
    213212ENABLE_VIEW_MODE_CSS_MEDIA = ;
    214213ENABLE_WEBGL = ENABLE_WEBGL;
    … …  
    245244ENABLE_LLINT_C_LOOP = ;
    246245
    247 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));
     246FEATURE_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));
Note: See TracChangeset for help on using the changeset viewer.