Diff
Modified: trunk/LayoutTests/http/tests/media/resources/serve-video.php (188659 => 188660)
--- trunk/LayoutTests/http/tests/media/resources/serve-video.php 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/LayoutTests/http/tests/media/resources/serve-video.php 2015-08-19 23:14:49 UTC (rev 188660)
@@ -20,6 +20,7 @@
"supportRanges" => array_key_exists("ranges", $_GET) ? $_GET["ranges"] : "yes",
"stallOffset" => array_key_exists("stallOffset", $_GET) ? $_GET["stallOffset"] : 0,
"stallDuration" => array_key_exists("stallDuration", $_GET) ? $_GET["stallDuration"] : 2,
+ "contentDisposition" => array_key_exists("content-disposition", $_GET) ? dirname($_GET["content-disposition"]) : "",
);
// 500 on errors
@@ -135,6 +136,8 @@
header("Content-Length: " . ($end - $start + 1));
if (isset($contentRange))
header("Content-Range: bytes " . $start . "-" . $end . "/" . $fileSize);
+ if ($isset["contentDisposition"])
+ header("Content-Disposition: " . $settings["contentDisposition"]);
$offset = $start;
Added: trunk/LayoutTests/http/tests/media/video-media-document-disposition-download.html (0 => 188660)
--- trunk/LayoutTests/http/tests/media/video-media-document-disposition-download.html (rev 0)
+++ trunk/LayoutTests/http/tests/media/video-media-document-disposition-download.html 2015-08-19 23:14:49 UTC (rev 188660)
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>'stalled' event test</title>
+ <script src=""
+ <script src=""
+ <script src=""
+
+ <script>
+
+ var iframe;
+ var timeline;
+
+ function testElement()
+ {
+ timeline = mediaControlsElement(internals.shadowRoot(mediaElement).firstChild.firstChild, '-webkit-media-controls-timeline');
+ if (!timeline)
+ throw "Failed to find -webkit-media-controls-timeline";
+
+ testExpected("mediaElement.paused", false);
+ testExpected('mediaElement.currentTime', 0, '!=');
+ test("timeline.value > 0");
+
+ consoleWrite("");
+ endTest();
+ }
+
+ function play()
+ {
+ waitForEventOnce('timeupdate', testElement);
+ }
+
+ function start()
+ {
+ mediaElement = iframe.contentDocument.querySelector("video");
+ waitForEvent('play', play);
+ mediaElement.pause();
+ mediaElement.play();
+ }
+
+ function setup()
+ {
+ iframe = document.getElementById("container");
+ iframe._onload_ = start;
+
+ var mediaFile = findMediaFile("video", "../../../../media/content/test");
+ var mimeType = "&type=" + mimeTypeForFile(mediaFile);
+ var fileExtension = mediaFile.substring(mediaFile.lastIndexOf(".") + 1);
+ var contentDisposition = "&content-disposition" + "attachment;test." + fileExtension
+
+ iframe.src = "" + mediaFile + mimeType + contentDisposition;
+ }
+ </script>
+
+ </head>
+ <body _onload_="setup()">
+ <p>Test that controls in a media document function.<p>
+
+ <iframe style="width: 400px; height: 300px; border: 0px;" id="container"> </iframe>
+ </body>
+</html>
+
Modified: trunk/Source/_javascript_Core/ChangeLog (188659 => 188660)
--- trunk/Source/_javascript_Core/ChangeLog 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-08-19 23:14:49 UTC (rev 188660)
@@ -1,3 +1,12 @@
+2015-08-19 Eric Carlson <eric.carl...@apple.com>
+
+ Remove ENABLE_WEBVTT_REGIONS
+ https://bugs.webkit.org/show_bug.cgi?id=148184
+
+ Reviewed by Jer Noble.
+
+ * Configurations/FeatureDefines.xcconfig: Remove ENABLE_WEBVTT_REGIONS.
+
2015-08-19 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: Unexpected node preview format for an element with newlines in className attribute
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (188659 => 188660)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2015-08-19 23:14:49 UTC (rev 188660)
@@ -215,7 +215,6 @@
ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
-ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
// FIXME: Remove the USE_INTERNAL_SDK condition once we support XSLT when building for iOS with the
@@ -229,4 +228,4 @@
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(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_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENA
BLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABL
E_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(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_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENAB
LE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE
_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
Modified: trunk/Source/WebCore/ChangeLog (188659 => 188660)
--- trunk/Source/WebCore/ChangeLog 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/ChangeLog 2015-08-19 23:14:49 UTC (rev 188660)
@@ -1,3 +1,84 @@
+2015-08-19 Eric Carlson <eric.carl...@apple.com>
+
+ Remove ENABLE_WEBVTT_REGIONS
+ https://bugs.webkit.org/show_bug.cgi?id=148184
+
+ Reviewed by Jer Noble.
+
+ * Configurations/FeatureDefines.xcconfig: Remove ENABLE_WEBVTT_REGIONS.
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::textTrackRemoveCue):
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlTextTrackContainerElement::updateDisplay):
+ * html/track/InbandGenericTextTrack.cpp:
+ (WebCore::InbandGenericTextTrack::newCuesParsed):
+ (WebCore::InbandGenericTextTrack::newRegionsParsed):
+ (WebCore::InbandGenericTextTrack::fileFailedToParse):
+ * html/track/InbandGenericTextTrack.h:
+ * html/track/InbandWebVTTTextTrack.cpp:
+ (WebCore::InbandWebVTTTextTrack::newCuesParsed):
+ (WebCore::InbandWebVTTTextTrack::newRegionsParsed):
+ (WebCore::InbandWebVTTTextTrack::fileFailedToParse):
+ * html/track/InbandWebVTTTextTrack.h:
+ * html/track/LoadableTextTrack.cpp:
+ (WebCore::LoadableTextTrack::cueLoadingCompleted):
+ (WebCore::LoadableTextTrack::newRegionsAvailable):
+ (WebCore::LoadableTextTrack::id):
+ * html/track/LoadableTextTrack.h:
+ * html/track/TextTrack.cpp:
+ (WebCore::TextTrack::TextTrack):
+ (WebCore::TextTrack::~TextTrack):
+ (WebCore::TextTrack::removeCue):
+ (WebCore::TextTrack::ensureVTTRegionList):
+ (WebCore::TextTrack::removeRegion):
+ (WebCore::TextTrack::cueWillChange):
+ * html/track/TextTrack.h:
+ * html/track/TextTrack.idl:
+ * html/track/TextTrackCue.cpp:
+ * html/track/VTTCue.cpp:
+ (WebCore::VTTCueBox::applyCSSProperties):
+ (WebCore::VTTCue::createCueRenderingTree):
+ (WebCore::VTTCue::setRegionId):
+ (WebCore::VTTCue::notifyRegionWhenRemovingDisplayTree):
+ (WebCore::VTTCue::setIsActive):
+ (WebCore::VTTCue::removeDisplayTree):
+ (WebCore::VTTCue::settingName):
+ (WebCore::VTTCue::setCueSettings):
+ (WebCore::VTTCue::getCSSAlignment):
+ * html/track/VTTCue.h:
+ (WebCore::VTTCue::regionId):
+ * html/track/VTTCue.idl:
+ * html/track/VTTRegion.cpp:
+ * html/track/VTTRegion.h:
+ * html/track/VTTRegion.idl:
+ * html/track/VTTRegionList.cpp:
+ * html/track/VTTRegionList.h:
+ * html/track/VTTRegionList.idl:
+ * html/track/WebVTTParser.cpp:
+ (WebCore::WebVTTParser::parseFloatPercentageValue):
+ (WebCore::WebVTTParser::parseFloatPercentageValuePair):
+ (WebCore::WebVTTParser::WebVTTParser):
+ (WebCore::WebVTTParser::getNewCues):
+ (WebCore::WebVTTParser::getNewRegions):
+ (WebCore::WebVTTParser::parseFileHeader):
+ (WebCore::WebVTTParser::parse):
+ (WebCore::WebVTTParser::collectMetadataHeader):
+ (WebCore::WebVTTParser::collectCueId):
+ (WebCore::WebVTTParser::resetCueValues):
+ (WebCore::WebVTTParser::createNewRegion):
+ (WebCore::WebVTTParser::collectTimeStamp):
+ * html/track/WebVTTParser.h:
+ (WebCore::WebVTTParserClient::~WebVTTParserClient):
+ * loader/TextTrackLoader.cpp:
+ (WebCore::TextTrackLoader::newCuesParsed):
+ (WebCore::TextTrackLoader::newRegionsParsed):
+ (WebCore::TextTrackLoader::fileFailedToParse):
+ (WebCore::TextTrackLoader::getNewCues):
+ (WebCore::TextTrackLoader::getNewRegions):
+ * loader/TextTrackLoader.h:
+ * rendering/RenderVTTCue.cpp:
+ (WebCore::RenderVTTCue::layout):
+
2015-08-19 Brent Fulgham <bfulg...@apple.com>
Scrollable area container is not properly cleared when page is going into the PageCache
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (188659 => 188660)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-08-19 23:14:49 UTC (rev 188660)
@@ -215,7 +215,6 @@
ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
-ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
// FIXME: Remove the USE_INTERNAL_SDK condition once we support XSLT when building for iOS with the
@@ -229,4 +228,4 @@
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(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_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENA
BLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABL
E_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(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_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENAB
LE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE
_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (188659 => 188660)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -1735,13 +1735,11 @@
CueInterval interval = m_cueTree.createInterval(cue->startMediaTime(), endTime, cue.get());
m_cueTree.remove(interval);
-#if ENABLE(WEBVTT_REGIONS)
// Since the cue will be removed from the media element and likely the
// TextTrack might also be destructed, notifying the region of the cue
// removal shouldn't be done.
if (cue->isRenderable())
toVTTCue(cue.get())->notifyRegionWhenRemovingDisplayTree(false);
-#endif
size_t index = m_currentlyActiveCues.find(interval);
if (index != notFound) {
@@ -1753,10 +1751,8 @@
toVTTCue(cue.get())->removeDisplayTree();
updateActiveTextTrackCues(currentMediaTime());
-#if ENABLE(WEBVTT_REGIONS)
if (cue->isRenderable())
toVTTCue(cue.get())->notifyRegionWhenRemovingDisplayTree(true);
-#endif
}
#endif
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (188659 => 188660)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -56,10 +56,7 @@
#if ENABLE(VIDEO_TRACK)
#include "TextTrackList.h"
#endif
-
-#if ENABLE(WEBVTT_REGIONS)
#include "VTTRegionList.h"
-#endif
namespace WebCore {
@@ -1179,7 +1176,6 @@
LOG(Media, "MediaControlTextTrackContainerElement::updateDisplay(%p) - adding and positioning cue #%zu: \"%s\", start=%.2f, end=%.2f, line=%.2f", this, i, cue->text().utf8().data(), cue->startTime(), cue->endTime(), cue->line());
RefPtr<VTTCueBox> displayBox = cue->getDisplayTree(m_videoDisplaySize.size(), m_fontSize);
-#if ENABLE(WEBVTT_REGIONS)
if (cue->track()->mode() == TextTrack::disabledKeyword())
continue;
@@ -1188,13 +1184,11 @@
// If cue has an empty text track cue region identifier or there is no
// WebVTT region whose region identifier is identical to cue's text
// track cue region identifier, run the following substeps:
-#endif
if (displayBox->hasChildNodes() && !contains(displayBox.get())) {
// Note: the display tree of a cue is removed when the active flag of the cue is unset.
appendChild(displayBox, ASSERT_NO_EXCEPTION);
cue->setFontSize(m_fontSize, m_videoDisplaySize.size(), m_fontSizeIsImportant);
}
-#if ENABLE(WEBVTT_REGIONS)
} else {
// Let region be the WebVTT region whose region identifier
// matches the text track cue region identifier of cue.
@@ -1206,7 +1200,6 @@
region->appendTextTrackCueBox(displayBox);
}
-#endif
}
// 11. Return output.
Modified: trunk/Source/WebCore/html/track/InbandGenericTextTrack.cpp (188659 => 188660)
--- trunk/Source/WebCore/html/track/InbandGenericTextTrack.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/InbandGenericTextTrack.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -33,12 +33,10 @@
#include "HTMLMediaElement.h"
#include "InbandTextTrackPrivate.h"
#include "Logging.h"
+#include "VTTRegionList.h"
#include <math.h>
#include <wtf/text/CString.h>
-#if ENABLE(WEBVTT_REGIONS)
-#include "VTTRegionList.h"
-#endif
namespace WebCore {
@@ -233,7 +231,6 @@
}
}
-#if ENABLE(WEBVTT_REGIONS)
void InbandGenericTextTrack::newRegionsParsed()
{
Vector<RefPtr<VTTRegion>> newRegions;
@@ -244,7 +241,6 @@
regions()->add(region);
}
}
-#endif
void InbandGenericTextTrack::fileFailedToParse()
{
Modified: trunk/Source/WebCore/html/track/InbandGenericTextTrack.h (188659 => 188660)
--- trunk/Source/WebCore/html/track/InbandGenericTextTrack.h 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/InbandGenericTextTrack.h 2015-08-19 23:14:49 UTC (rev 188660)
@@ -81,9 +81,7 @@
virtual void parseWebVTTFileHeader(InbandTextTrackPrivate*, String) override;
virtual void newCuesParsed() override;
-#if ENABLE(WEBVTT_REGIONS)
virtual void newRegionsParsed() override;
-#endif
virtual void fileFailedToParse() override;
GenericTextTrackCueMap m_cueMap;
Modified: trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp (188659 => 188660)
--- trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -32,12 +32,9 @@
#include "InbandTextTrackPrivate.h"
#include "Logging.h"
#include "NotImplemented.h"
+#include "VTTRegionList.h"
#include <wtf/text/CString.h>
-#if ENABLE(WEBVTT_REGIONS)
-#include "VTTRegionList.h"
-#endif
-
namespace WebCore {
Ref<InbandTextTrack> InbandWebVTTTextTrack::create(ScriptExecutionContext* context, TextTrackClient* client, PassRefPtr<InbandTextTrackPrivate> playerPrivate)
@@ -89,7 +86,6 @@
}
}
-#if ENABLE(WEBVTT_REGIONS)
void InbandWebVTTTextTrack::newRegionsParsed()
{
Vector<RefPtr<VTTRegion>> newRegions;
@@ -100,7 +96,6 @@
regions()->add(region);
}
}
-#endif
void InbandWebVTTTextTrack::fileFailedToParse()
{
Modified: trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.h (188659 => 188660)
--- trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.h 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.h 2015-08-19 23:14:49 UTC (rev 188660)
@@ -48,9 +48,7 @@
virtual void parseWebVTTCueData(InbandTextTrackPrivate*, const ISOWebVTTCue&) override;
virtual void newCuesParsed() override;
-#if ENABLE(WEBVTT_REGIONS)
virtual void newRegionsParsed() override;
-#endif
virtual void fileFailedToParse() override;
std::unique_ptr<WebVTTParser> m_webVTTParser;
Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.cpp (188659 => 188660)
--- trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -33,10 +33,7 @@
#include "HTMLTrackElement.h"
#include "ScriptExecutionContext.h"
#include "TextTrackCueList.h"
-
-#if ENABLE(WEBVTT_REGIONS)
#include "VTTRegionList.h"
-#endif
namespace WebCore {
@@ -132,7 +129,6 @@
m_trackElement->didCompleteLoad(loadingFailed ? HTMLTrackElement::Failure : HTMLTrackElement::Success);
}
-#if ENABLE(WEBVTT_REGIONS)
void LoadableTextTrack::newRegionsAvailable(TextTrackLoader* loader)
{
ASSERT_UNUSED(loader, m_loader.get() == loader);
@@ -145,7 +141,6 @@
regions()->add(newRegions[i]);
}
}
-#endif
AtomicString LoadableTextTrack::id() const
{
Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.h (188659 => 188660)
--- trunk/Source/WebCore/html/track/LoadableTextTrack.h 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.h 2015-08-19 23:14:49 UTC (rev 188660)
@@ -64,9 +64,7 @@
// TextTrackLoaderClient
virtual void newCuesAvailable(TextTrackLoader*) override;
virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) override;
-#if ENABLE(WEBVTT_REGIONS)
virtual void newRegionsAvailable(TextTrackLoader*) override;
-#endif
LoadableTextTrack(HTMLTrackElement*, const String& kind, const String& label, const String& language);
Modified: trunk/Source/WebCore/html/track/TextTrack.cpp (188659 => 188660)
--- trunk/Source/WebCore/html/track/TextTrack.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/TextTrack.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -116,9 +116,7 @@
TextTrack::TextTrack(ScriptExecutionContext* context, TextTrackClient* client, const AtomicString& kind, const AtomicString& id, const AtomicString& label, const AtomicString& language, TextTrackType type)
: TrackBase(TrackBase::TextTrack, id, label, language)
, m_cues(0)
-#if ENABLE(WEBVTT_REGIONS)
, m_regions(0)
-#endif
, m_scriptExecutionContext(context)
, m_mode(disabledKeyword().string())
, m_client(client)
@@ -139,12 +137,10 @@
for (size_t i = 0; i < m_cues->length(); ++i)
m_cues->item(i)->setTrack(0);
-#if ENABLE(WEBVTT_REGIONS)
if (m_regions) {
for (size_t i = 0; i < m_regions->length(); ++i)
m_regions->item(i)->setTrack(0);
}
-#endif
}
clearClient();
}
@@ -342,7 +338,6 @@
m_client->textTrackRemoveCue(this, cue);
}
-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
VTTRegionList* TextTrack::ensureVTTRegionList()
{
if (!m_regions)
@@ -414,7 +409,6 @@
region->setTrack(0);
}
-#endif
void TextTrack::cueWillChange(TextTrackCue* cue)
{
Modified: trunk/Source/WebCore/html/track/TextTrack.h (188659 => 188660)
--- trunk/Source/WebCore/html/track/TextTrack.h 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/TextTrack.h 2015-08-19 23:14:49 UTC (rev 188660)
@@ -41,10 +41,8 @@
class ScriptExecutionContext;
class TextTrack;
class TextTrackCueList;
-#if ENABLE(WEBVTT_REGIONS)
class VTTRegion;
class VTTRegionList;
-#endif
class TextTrackClient {
public:
@@ -106,11 +104,9 @@
bool hasCue(TextTrackCue*, TextTrackCue::CueMatchRules = TextTrackCue::MatchAllFields);
-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
VTTRegionList* regions();
void addRegion(PassRefPtr<VTTRegion>);
void removeRegion(VTTRegion*, ExceptionCode&);
-#endif
void cueWillChange(TextTrackCue*);
void cueDidChange(TextTrackCue*);
@@ -162,10 +158,8 @@
virtual void refEventTarget() override final { ref(); }
virtual void derefEventTarget() override final { deref(); }
-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
VTTRegionList* ensureVTTRegionList();
RefPtr<VTTRegionList> m_regions;
-#endif
TextTrackCueList* ensureTextTrackCueList();
Modified: trunk/Source/WebCore/html/track/TextTrack.idl (188659 => 188660)
--- trunk/Source/WebCore/html/track/TextTrack.idl 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/TextTrack.idl 2015-08-19 23:14:49 UTC (rev 188660)
@@ -50,9 +50,9 @@
attribute EventHandler oncuechange;
#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT // Work around shortcomings in the gobject binding generator handling of conditional features by turning these off for gobject.
- [Conditional=WEBVTT_REGIONS] readonly attribute VTTRegionList regions;
- [Conditional=WEBVTT_REGIONS] void addRegion(VTTRegion region);
- [Conditional=WEBVTT_REGIONS, RaisesException] void removeRegion(VTTRegion region);
+ readonly attribute VTTRegionList regions;
+ void addRegion(VTTRegion region);
+ [RaisesException] void removeRegion(VTTRegion region);
#endif
// EventTarget interface
Modified: trunk/Source/WebCore/html/track/TextTrackCue.cpp (188659 => 188660)
--- trunk/Source/WebCore/html/track/TextTrackCue.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/TextTrackCue.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -47,13 +47,10 @@
#include "TextTrack.h"
#include "TextTrackCueList.h"
#include "VTTCue.h"
+#include "VTTRegionList.h"
#include <wtf/MathExtras.h>
#include <wtf/text/StringBuilder.h>
-#if ENABLE(WEBVTT_REGIONS)
-#include "VTTRegionList.h"
-#endif
-
namespace WebCore {
static const int invalidCueIndex = -1;
Modified: trunk/Source/WebCore/html/track/VTTCue.cpp (188659 => 188660)
--- trunk/Source/WebCore/html/track/VTTCue.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/VTTCue.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -46,16 +46,13 @@
#include "Text.h"
#include "TextTrack.h"
#include "TextTrackCueList.h"
+#include "VTTRegionList.h"
#include "VTTScanner.h"
#include "WebVTTElement.h"
#include "WebVTTParser.h"
#include <wtf/MathExtras.h>
#include <wtf/text/StringBuilder.h>
-#if ENABLE(WEBVTT_REGIONS)
-#include "VTTRegionList.h"
-#endif
-
namespace WebCore {
// This constant should correspond with the percentage returned by CaptionUserPreferences::captionFontSizeScaleAndImportance.
@@ -144,12 +141,10 @@
void VTTCueBox::applyCSSProperties(const IntSize& videoSize)
{
// FIXME: Apply all the initial CSS positioning properties. http://wkb.ug/79916
-#if ENABLE(WEBVTT_REGIONS)
if (!m_cue.regionId().isEmpty()) {
setInlineStyleProperty(CSSPropertyPosition, CSSValueRelative);
return;
}
-#endif
// 3.5.1 On the (root) List of WebVTT Node Objects:
@@ -530,7 +525,6 @@
return clonedFragment.release();
}
-#if ENABLE(WEBVTT_REGIONS)
void VTTCue::setRegionId(const String& regionId)
{
if (m_regionId == regionId)
@@ -545,7 +539,6 @@
{
m_notifyRegion = notifyRegion;
}
-#endif
void VTTCue::setIsActive(bool active)
{
@@ -838,7 +831,6 @@
void VTTCue::removeDisplayTree()
{
-#if ENABLE(WEBVTT_REGIONS)
// The region needs to be informed about the cue removal.
if (m_notifyRegion && track()) {
if (VTTRegionList* regions = track()->regions()) {
@@ -846,7 +838,6 @@
region->willRemoveTextTrackCueBox(m_displayTree.get());
}
}
-#endif
if (!hasDisplayTree())
return;
@@ -904,10 +895,9 @@
parsedSetting = Size;
else if (input.scan("align"))
parsedSetting = Align;
-#if ENABLE(WEBVTT_REGIONS)
else if (input.scan("region"))
parsedSetting = RegionId;
-#endif
+
// Verify that a ':' follows.
if (parsedSetting != None && input.scan(':'))
return parsedSetting;
@@ -1058,11 +1048,9 @@
break;
}
-#if ENABLE(WEBVTT_REGIONS)
case RegionId:
m_regionId = input.extractString(valueRun);
break;
-#endif
case None:
break;
}
@@ -1070,7 +1058,7 @@
// Make sure the entire run is consumed.
input.skipRun(valueRun);
}
-#if ENABLE(WEBVTT_REGIONS)
+
// If cue's line position is not auto or cue's size is not 100 or cue's
// writing direction is not horizontal, but cue's region identifier is not
// the empty string, let cue's region identifier be the empty string.
@@ -1079,7 +1067,6 @@
if (m_linePosition != undefinedPosition || m_cueSize != 100 || m_writingDirection != Horizontal)
m_regionId = emptyString();
-#endif
}
CSSValueID VTTCue::getCSSAlignment() const
Modified: trunk/Source/WebCore/html/track/VTTCue.h (188659 => 188660)
--- trunk/Source/WebCore/html/track/VTTCue.h 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/VTTCue.h 2015-08-19 23:14:49 UTC (rev 188660)
@@ -117,11 +117,9 @@
PassRefPtr<DocumentFragment> getCueAsHTML();
PassRefPtr<DocumentFragment> createCueRenderingTree();
-#if ENABLE(WEBVTT_REGIONS)
const String& regionId() const { return m_regionId; }
void setRegionId(const String&);
void notifyRegionWhenRemovingDisplayTree(bool);
-#endif
virtual void setIsActive(bool) override;
@@ -196,9 +194,7 @@
Position,
Size,
Align,
-#if ENABLE(WEBVTT_REGIONS)
RegionId
-#endif
};
CueSetting settingName(VTTScanner&);
@@ -211,9 +207,7 @@
WritingDirection m_writingDirection;
CueAlignment m_cueAlignment;
-#if ENABLE(WEBVTT_REGIONS)
String m_regionId;
-#endif
RefPtr<DocumentFragment> m_webVTTNodeTree;
RefPtr<HTMLSpanElement> m_cueHighlightBox;
Modified: trunk/Source/WebCore/html/track/VTTCue.idl (188659 => 188660)
--- trunk/Source/WebCore/html/track/VTTCue.idl 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/VTTCue.idl 2015-08-19 23:14:49 UTC (rev 188660)
@@ -38,7 +38,5 @@
attribute DOMString text;
DocumentFragment getCueAsHTML();
-#if defined(ENABLE_WEBVTT_REGIONS) && ENABLE_WEBVTT_REGIONS
attribute DOMString regionId;
-#endif
};
Modified: trunk/Source/WebCore/html/track/VTTRegion.cpp (188659 => 188660)
--- trunk/Source/WebCore/html/track/VTTRegion.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/VTTRegion.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -32,7 +32,7 @@
#include "config.h"
#include "VTTRegion.h"
-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
+#if ENABLE(VIDEO_TRACK)
#include "ClientRect.h"
#include "DOMTokenList.h"
Modified: trunk/Source/WebCore/html/track/VTTRegion.h (188659 => 188660)
--- trunk/Source/WebCore/html/track/VTTRegion.h 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/VTTRegion.h 2015-08-19 23:14:49 UTC (rev 188660)
@@ -32,7 +32,7 @@
#ifndef VTTRegion_h
#define VTTRegion_h
-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
+#if ENABLE(VIDEO_TRACK)
#include "ContextDestructionObserver.h"
#include "Document.h"
Modified: trunk/Source/WebCore/html/track/VTTRegion.idl (188659 => 188660)
--- trunk/Source/WebCore/html/track/VTTRegion.idl 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/VTTRegion.idl 2015-08-19 23:14:49 UTC (rev 188660)
@@ -25,7 +25,7 @@
*/
[
- Conditional=VIDEO_TRACK & WEBVTT_REGIONS,
+ Conditional=VIDEO_TRACK,
JSGenerateToNativeObject,
Constructor(),
ConstructorCallWith=ScriptExecutionContext
Modified: trunk/Source/WebCore/html/track/VTTRegionList.cpp (188659 => 188660)
--- trunk/Source/WebCore/html/track/VTTRegionList.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/VTTRegionList.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -27,7 +27,7 @@
#include "config.h"
#include "VTTRegionList.h"
-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
+#if ENABLE(VIDEO_TRACK)
namespace WebCore {
Modified: trunk/Source/WebCore/html/track/VTTRegionList.h (188659 => 188660)
--- trunk/Source/WebCore/html/track/VTTRegionList.h 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/VTTRegionList.h 2015-08-19 23:14:49 UTC (rev 188660)
@@ -27,7 +27,7 @@
#ifndef VTTRegionList_h
#define VTTRegionList_h
-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
+#if ENABLE(VIDEO_TRACK)
#include "VTTRegion.h"
#include <wtf/PassRefPtr.h>
Modified: trunk/Source/WebCore/html/track/VTTRegionList.idl (188659 => 188660)
--- trunk/Source/WebCore/html/track/VTTRegionList.idl 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/VTTRegionList.idl 2015-08-19 23:14:49 UTC (rev 188660)
@@ -25,7 +25,7 @@
[
NoInterfaceObject,
- Conditional=VIDEO_TRACK & WEBVTT_REGIONS,
+ Conditional=VIDEO_TRACK,
ImplementationLacksVTable,
] interface VTTRegionList {
readonly attribute unsigned long length;
Modified: trunk/Source/WebCore/html/track/WebVTTParser.cpp (188659 => 188660)
--- trunk/Source/WebCore/html/track/WebVTTParser.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/WebVTTParser.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -67,7 +67,6 @@
return true;
}
-#if ENABLE(WEBVTT_REGIONS)
bool WebVTTParser::parseFloatPercentageValuePair(VTTScanner& valueScanner, char delimiter, FloatPoint& valuePair)
{
float firstCoord;
@@ -84,7 +83,6 @@
valuePair = FloatPoint(firstCoord, secondCoord);
return true;
}
-#endif
WebVTTParser::WebVTTParser(WebVTTParserClient* client, ScriptExecutionContext* context)
: m_scriptExecutionContext(context)
@@ -100,13 +98,11 @@
m_cuelist.clear();
}
-#if ENABLE(WEBVTT_REGIONS)
void WebVTTParser::getNewRegions(Vector<RefPtr<VTTRegion>>& outputRegions)
{
outputRegions = m_regionList;
m_regionList.clear();
}
-#endif
void WebVTTParser::parseFileHeader(const String& data)
{
@@ -178,11 +174,9 @@
collectMetadataHeader(line);
if (line.isEmpty()) {
-#if ENABLE(WEBVTT_REGIONS)
// Steps 10-14 - Allow a header (comment area) under the WEBVTT line.
if (m_client && m_regionList.size())
m_client->newRegionsParsed();
-#endif
m_state = Id;
break;
}
@@ -266,7 +260,6 @@
void WebVTTParser::collectMetadataHeader(const String& line)
{
-#if ENABLE(WEBVTT_REGIONS)
// WebVTT header parsing (WebVTT parser algorithm step 12)
DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, regionHeaderName, ("Region", AtomicString::ConstructFromLiteral));
@@ -285,9 +278,6 @@
// Steps 12.5.1 - 12.5.11 Region creation: Let region be a new text track region [...]
createNewRegion(headerValue);
}
-#else
- UNUSED_PARAM(line);
-#endif
}
WebVTTParser::ParseState WebVTTParser::collectCueId(const String& line)
@@ -441,7 +431,6 @@
m_currentContent.clear();
}
-#if ENABLE(WEBVTT_REGIONS)
void WebVTTParser::createNewRegion(const String& headerValue)
{
if (headerValue.isEmpty())
@@ -462,7 +451,6 @@
// Step 12.5.11
m_regionList.append(region);
}
-#endif
bool WebVTTParser::collectTimeStamp(const String& line, MediaTime& timeStamp)
{
Modified: trunk/Source/WebCore/html/track/WebVTTParser.h (188659 => 188660)
--- trunk/Source/WebCore/html/track/WebVTTParser.h 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/html/track/WebVTTParser.h 2015-08-19 23:14:49 UTC (rev 188660)
@@ -58,9 +58,7 @@
virtual ~WebVTTParserClient() { }
virtual void newCuesParsed() = 0;
-#if ENABLE(WEBVTT_REGIONS)
virtual void newRegionsParsed() = 0;
-#endif
virtual void fileFailedToParse() = 0;
};
@@ -132,9 +130,7 @@
// Useful functions for parsing percentage settings.
static bool parseFloatPercentageValue(VTTScanner& valueScanner, float&);
-#if ENABLE(WEBVTT_REGIONS)
static bool parseFloatPercentageValuePair(VTTScanner& valueScanner, char, FloatPoint&);
-#endif
// Input data to the parser to parse.
void parseBytes(const char*, unsigned);
@@ -145,9 +141,7 @@
// Transfers ownership of last parsed cues to caller.
void getNewCues(Vector<RefPtr<WebVTTCueData>>&);
-#if ENABLE(WEBVTT_REGIONS)
void getNewRegions(Vector<RefPtr<VTTRegion>>&);
-#endif
// Create the DocumentFragment representation of the WebVTT cue text.
static PassRefPtr<DocumentFragment> createDocumentFragmentFromCueText(Document&, const String&);
@@ -170,9 +164,7 @@
void resetCueValues();
void collectMetadataHeader(const String&);
-#if ENABLE(WEBVTT_REGIONS)
void createNewRegion(const String& headerValue);
-#endif
static bool collectTimeStamp(VTTScanner& input, MediaTime& timeStamp);
@@ -187,10 +179,7 @@
WebVTTParserClient* m_client;
Vector<RefPtr<WebVTTCueData>> m_cuelist;
-
-#if ENABLE(WEBVTT_REGIONS)
Vector<RefPtr<VTTRegion>> m_regionList;
-#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/loader/TextTrackLoader.cpp (188659 => 188660)
--- trunk/Source/WebCore/loader/TextTrackLoader.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/loader/TextTrackLoader.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -187,12 +187,10 @@
m_cueLoadTimer.startOneShot(0);
}
-#if ENABLE(WEBVTT_REGIONS)
void TextTrackLoader::newRegionsParsed()
{
m_client.newRegionsAvailable(this);
}
-#endif
void TextTrackLoader::fileFailedToParse()
{
@@ -218,14 +216,13 @@
}
}
-#if ENABLE(WEBVTT_REGIONS)
void TextTrackLoader::getNewRegions(Vector<RefPtr<VTTRegion>>& outputRegions)
{
ASSERT(m_cueParser);
if (m_cueParser)
m_cueParser->getNewRegions(outputRegions);
}
-#endif
+
}
#endif
Modified: trunk/Source/WebCore/loader/TextTrackLoader.h (188659 => 188660)
--- trunk/Source/WebCore/loader/TextTrackLoader.h 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/loader/TextTrackLoader.h 2015-08-19 23:14:49 UTC (rev 188660)
@@ -47,9 +47,7 @@
virtual void newCuesAvailable(TextTrackLoader*) = 0;
virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) = 0;
-#if ENABLE(WEBVTT_REGIONS)
virtual void newRegionsAvailable(TextTrackLoader*) = 0;
-#endif
};
class TextTrackLoader : public CachedResourceClient, private WebVTTParserClient {
@@ -62,9 +60,7 @@
bool load(const URL&, const String& crossOriginMode, bool isInitiatingElementInUserAgentShadowTree);
void cancelLoad();
void getNewCues(Vector<RefPtr<TextTrackCue>>& outputCues);
-#if ENABLE(WEBVTT_REGIONS)
void getNewRegions(Vector<RefPtr<VTTRegion>>& outputRegions);
-#endif
private:
// CachedResourceClient
@@ -73,9 +69,7 @@
// WebVTTParserClient
virtual void newCuesParsed() override;
-#if ENABLE(WEBVTT_REGIONS)
virtual void newRegionsParsed() override;
-#endif
virtual void fileFailedToParse() override;
void processNewCueData(CachedResource*);
Modified: trunk/Source/WebCore/rendering/RenderVTTCue.cpp (188659 => 188660)
--- trunk/Source/WebCore/rendering/RenderVTTCue.cpp 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebCore/rendering/RenderVTTCue.cpp 2015-08-19 23:14:49 UTC (rev 188660)
@@ -47,14 +47,12 @@
StackStats::LayoutCheckPoint layoutCheckPoint;
RenderBlockFlow::layout();
-#if ENABLE(WEBVTT_REGIONS)
// If WebVTT Regions are used, the regular WebVTT layout algorithm is no
// longer necessary, since cues having the region parameter set do not have
// any positioning parameters. Also, in this case, the regions themselves
// have positioning information.
if (!m_cue->regionId().isEmpty())
return;
-#endif
LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
Modified: trunk/Source/WebKit/mac/ChangeLog (188659 => 188660)
--- trunk/Source/WebKit/mac/ChangeLog 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-08-19 23:14:49 UTC (rev 188660)
@@ -1,3 +1,12 @@
+2015-08-19 Eric Carlson <eric.carl...@apple.com>
+
+ Remove ENABLE_WEBVTT_REGIONS
+ https://bugs.webkit.org/show_bug.cgi?id=148184
+
+ Reviewed by Jer Noble.
+
+ * Configurations/FeatureDefines.xcconfig: Remove ENABLE_WEBVTT_REGIONS.
+
2015-08-17 Filip Pizlo <fpi...@apple.com>
Replace all remaining uses of WTF::Mutex with WTF::Lock
Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (188659 => 188660)
--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-08-19 23:14:49 UTC (rev 188660)
@@ -215,7 +215,6 @@
ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
-ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
// FIXME: Remove the USE_INTERNAL_SDK condition once we support XSLT when building for iOS with the
@@ -229,4 +228,4 @@
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(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_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENA
BLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABL
E_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(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_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENAB
LE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE
_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
Modified: trunk/Source/WebKit2/ChangeLog (188659 => 188660)
--- trunk/Source/WebKit2/ChangeLog 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-19 23:14:49 UTC (rev 188660)
@@ -1,3 +1,12 @@
+2015-08-19 Eric Carlson <eric.carl...@apple.com>
+
+ Remove ENABLE_WEBVTT_REGIONS
+ https://bugs.webkit.org/show_bug.cgi?id=148184
+
+ Reviewed by Jer Noble.
+
+ * Configurations/FeatureDefines.xcconfig: Remove ENABLE_WEBVTT_REGIONS.
+
2015-08-18 Dean Jackson <d...@apple.com>
Support CSS filters without webkit prefix
Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (188659 => 188660)
--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-08-19 23:14:49 UTC (rev 188660)
@@ -215,7 +215,6 @@
ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
-ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
// FIXME: Remove the USE_INTERNAL_SDK condition once we support XSLT when building for iOS with the
@@ -229,4 +228,4 @@
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(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_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENA
BLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABL
E_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_MODULES) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(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_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENAB
LE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE
_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
