<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[188660] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/188660">188660</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-08-19 16:14:49 -0700 (Wed, 19 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove ENABLE_WEBVTT_REGIONS
https://bugs.webkit.org/show_bug.cgi?id=148184
Reviewed by Jer Noble.
* Configurations/FeatureDefines.xcconfig: Remove ENABLE_WEBVTT_REGIONS.
Source/WebCore:
* 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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmediaresourcesservevideophp">trunk/LayoutTests/http/tests/media/resources/serve-video.php</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackInbandGenericTextTrackcpp">trunk/Source/WebCore/html/track/InbandGenericTextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackInbandGenericTextTrackh">trunk/Source/WebCore/html/track/InbandGenericTextTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackInbandWebVTTTextTrackcpp">trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackInbandWebVTTTextTrackh">trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackLoadableTextTrackcpp">trunk/Source/WebCore/html/track/LoadableTextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackLoadableTextTrackh">trunk/Source/WebCore/html/track/LoadableTextTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackcpp">trunk/Source/WebCore/html/track/TextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackh">trunk/Source/WebCore/html/track/TextTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackidl">trunk/Source/WebCore/html/track/TextTrack.idl</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackCuecpp">trunk/Source/WebCore/html/track/TextTrackCue.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTCuecpp">trunk/Source/WebCore/html/track/VTTCue.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTCueh">trunk/Source/WebCore/html/track/VTTCue.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTCueidl">trunk/Source/WebCore/html/track/VTTCue.idl</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTRegioncpp">trunk/Source/WebCore/html/track/VTTRegion.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTRegionh">trunk/Source/WebCore/html/track/VTTRegion.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTRegionidl">trunk/Source/WebCore/html/track/VTTRegion.idl</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTRegionListcpp">trunk/Source/WebCore/html/track/VTTRegionList.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTRegionListh">trunk/Source/WebCore/html/track/VTTRegionList.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTRegionListidl">trunk/Source/WebCore/html/track/VTTRegionList.idl</a></li>
<li><a href="#trunkSourceWebCorehtmltrackWebVTTParsercpp">trunk/Source/WebCore/html/track/WebVTTParser.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackWebVTTParserh">trunk/Source/WebCore/html/track/WebVTTParser.h</a></li>
<li><a href="#trunkSourceWebCoreloaderTextTrackLoadercpp">trunk/Source/WebCore/loader/TextTrackLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderTextTrackLoaderh">trunk/Source/WebCore/loader/TextTrackLoader.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderVTTCuecpp">trunk/Source/WebCore/rendering/RenderVTTCue.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmediavideomediadocumentdispositiondownloadhtml">trunk/LayoutTests/http/tests/media/video-media-document-disposition-download.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestshttptestsmediaresourcesservevideophp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/resources/serve-video.php (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> "supportRanges" => array_key_exists("ranges", $_GET) ? $_GET["ranges"] : "yes",
</span><span class="cx"> "stallOffset" => array_key_exists("stallOffset", $_GET) ? $_GET["stallOffset"] : 0,
</span><span class="cx"> "stallDuration" => array_key_exists("stallDuration", $_GET) ? $_GET["stallDuration"] : 2,
</span><ins>+ "contentDisposition" => array_key_exists("content-disposition", $_GET) ? dirname($_GET["content-disposition"]) : "",
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // 500 on errors
</span><span class="lines">@@ -135,6 +136,8 @@
</span><span class="cx"> header("Content-Length: " . ($end - $start + 1));
</span><span class="cx"> if (isset($contentRange))
</span><span class="cx"> header("Content-Range: bytes " . $start . "-" . $end . "/" . $fileSize);
</span><ins>+ if ($isset["contentDisposition"])
+ header("Content-Disposition: " . $settings["contentDisposition"]);
</ins><span class="cx">
</span><span class="cx"> $offset = $start;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediavideomediadocumentdispositiondownloadhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/video-media-document-disposition-download.html (0 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>'stalled' event test</title>
+ <script src=../../media-resources/media-file.js></script>
+ <script src=../../media-resources/video-test.js></script>
+ <script src=../../media-resources/media-controls></script>
+
+ <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 = "http://127.0.0.1:8000/media/resources/serve-video.php?name=" + 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>
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-19 23:14:49 UTC (rev 188660)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-08-19 Eric Carlson <eric.carlson@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.
+
</ins><span class="cx"> 2015-08-19 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Unexpected node preview format for an element with newlines in className attribute
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2015-08-19 23:06:03 UTC (rev 188659)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2015-08-19 23:14:49 UTC (rev 188660)
</span><span class="lines">@@ -215,7 +215,6 @@
</span><span class="cx"> ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
</span><span class="cx"> ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
</span><span class="cx">
</span><del>-ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
</del><span class="cx"> ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove the USE_INTERNAL_SDK condition once we support XSLT when building for iOS with the
</span><span class="lines">@@ -229,4 +228,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx">
</span><del>-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);
</del><ins>+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);
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,84 @@
</span><ins>+2015-08-19 Eric Carlson <eric.carlson@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):
+
</ins><span class="cx"> 2015-08-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Scrollable area container is not properly cleared when page is going into the PageCache
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -215,7 +215,6 @@
</span><span class="cx"> ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
</span><span class="cx"> ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
</span><span class="cx">
</span><del>-ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
</del><span class="cx"> ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove the USE_INTERNAL_SDK condition once we support XSLT when building for iOS with the
</span><span class="lines">@@ -229,4 +228,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx">
</span><del>-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);
</del><ins>+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);
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1735,13 +1735,11 @@
</span><span class="cx"> CueInterval interval = m_cueTree.createInterval(cue->startMediaTime(), endTime, cue.get());
</span><span class="cx"> m_cueTree.remove(interval);
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> // Since the cue will be removed from the media element and likely the
</span><span class="cx"> // TextTrack might also be destructed, notifying the region of the cue
</span><span class="cx"> // removal shouldn't be done.
</span><span class="cx"> if (cue->isRenderable())
</span><span class="cx"> toVTTCue(cue.get())->notifyRegionWhenRemovingDisplayTree(false);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> size_t index = m_currentlyActiveCues.find(interval);
</span><span class="cx"> if (index != notFound) {
</span><span class="lines">@@ -1753,10 +1751,8 @@
</span><span class="cx"> toVTTCue(cue.get())->removeDisplayTree();
</span><span class="cx"> updateActiveTextTrackCues(currentMediaTime());
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> if (cue->isRenderable())
</span><span class="cx"> toVTTCue(cue.get())->notifyRegionWhenRemovingDisplayTree(true);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -56,10 +56,7 @@
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> #include "TextTrackList.h"
</span><span class="cx"> #endif
</span><del>-
-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> #include "VTTRegionList.h"
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -1179,7 +1176,6 @@
</span><span class="cx"> 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());
</span><span class="cx">
</span><span class="cx"> RefPtr<VTTCueBox> displayBox = cue->getDisplayTree(m_videoDisplaySize.size(), m_fontSize);
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> if (cue->track()->mode() == TextTrack::disabledKeyword())
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -1188,13 +1184,11 @@
</span><span class="cx"> // If cue has an empty text track cue region identifier or there is no
</span><span class="cx"> // WebVTT region whose region identifier is identical to cue's text
</span><span class="cx"> // track cue region identifier, run the following substeps:
</span><del>-#endif
</del><span class="cx"> if (displayBox->hasChildNodes() && !contains(displayBox.get())) {
</span><span class="cx"> // Note: the display tree of a cue is removed when the active flag of the cue is unset.
</span><span class="cx"> appendChild(displayBox, ASSERT_NO_EXCEPTION);
</span><span class="cx"> cue->setFontSize(m_fontSize, m_videoDisplaySize.size(), m_fontSizeIsImportant);
</span><span class="cx"> }
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> } else {
</span><span class="cx"> // Let region be the WebVTT region whose region identifier
</span><span class="cx"> // matches the text track cue region identifier of cue.
</span><span class="lines">@@ -1206,7 +1200,6 @@
</span><span class="cx">
</span><span class="cx"> region->appendTextTrackCueBox(displayBox);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 11. Return output.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackInbandGenericTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/InbandGenericTextTrack.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,12 +33,10 @@
</span><span class="cx"> #include "HTMLMediaElement.h"
</span><span class="cx"> #include "InbandTextTrackPrivate.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "VTTRegionList.h"
</ins><span class="cx"> #include <math.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
-#include "VTTRegionList.h"
-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -233,7 +231,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> void InbandGenericTextTrack::newRegionsParsed()
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<VTTRegion>> newRegions;
</span><span class="lines">@@ -244,7 +241,6 @@
</span><span class="cx"> regions()->add(region);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void InbandGenericTextTrack::fileFailedToParse()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackInbandGenericTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/InbandGenericTextTrack.h (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -81,9 +81,7 @@
</span><span class="cx"> virtual void parseWebVTTFileHeader(InbandTextTrackPrivate*, String) override;
</span><span class="cx">
</span><span class="cx"> virtual void newCuesParsed() override;
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> virtual void newRegionsParsed() override;
</span><del>-#endif
</del><span class="cx"> virtual void fileFailedToParse() override;
</span><span class="cx">
</span><span class="cx"> GenericTextTrackCueMap m_cueMap;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackInbandWebVTTTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,12 +32,9 @@
</span><span class="cx"> #include "InbandTextTrackPrivate.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><ins>+#include "VTTRegionList.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
-#include "VTTRegionList.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> Ref<InbandTextTrack> InbandWebVTTTextTrack::create(ScriptExecutionContext* context, TextTrackClient* client, PassRefPtr<InbandTextTrackPrivate> playerPrivate)
</span><span class="lines">@@ -89,7 +86,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> void InbandWebVTTTextTrack::newRegionsParsed()
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<VTTRegion>> newRegions;
</span><span class="lines">@@ -100,7 +96,6 @@
</span><span class="cx"> regions()->add(region);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void InbandWebVTTTextTrack::fileFailedToParse()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackInbandWebVTTTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.h (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -48,9 +48,7 @@
</span><span class="cx"> virtual void parseWebVTTCueData(InbandTextTrackPrivate*, const ISOWebVTTCue&) override;
</span><span class="cx">
</span><span class="cx"> virtual void newCuesParsed() override;
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> virtual void newRegionsParsed() override;
</span><del>-#endif
</del><span class="cx"> virtual void fileFailedToParse() override;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebVTTParser> m_webVTTParser;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackLoadableTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,10 +33,7 @@
</span><span class="cx"> #include "HTMLTrackElement.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "TextTrackCueList.h"
</span><del>-
-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> #include "VTTRegionList.h"
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -132,7 +129,6 @@
</span><span class="cx"> m_trackElement->didCompleteLoad(loadingFailed ? HTMLTrackElement::Failure : HTMLTrackElement::Success);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> void LoadableTextTrack::newRegionsAvailable(TextTrackLoader* loader)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(loader, m_loader.get() == loader);
</span><span class="lines">@@ -145,7 +141,6 @@
</span><span class="cx"> regions()->add(newRegions[i]);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> AtomicString LoadableTextTrack::id() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackLoadableTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.h (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -64,9 +64,7 @@
</span><span class="cx"> // TextTrackLoaderClient
</span><span class="cx"> virtual void newCuesAvailable(TextTrackLoader*) override;
</span><span class="cx"> virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) override;
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> virtual void newRegionsAvailable(TextTrackLoader*) override;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> LoadableTextTrack(HTMLTrackElement*, const String& kind, const String& label, const String& language);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrack.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -116,9 +116,7 @@
</span><span class="cx"> TextTrack::TextTrack(ScriptExecutionContext* context, TextTrackClient* client, const AtomicString& kind, const AtomicString& id, const AtomicString& label, const AtomicString& language, TextTrackType type)
</span><span class="cx"> : TrackBase(TrackBase::TextTrack, id, label, language)
</span><span class="cx"> , m_cues(0)
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> , m_regions(0)
</span><del>-#endif
</del><span class="cx"> , m_scriptExecutionContext(context)
</span><span class="cx"> , m_mode(disabledKeyword().string())
</span><span class="cx"> , m_client(client)
</span><span class="lines">@@ -139,12 +137,10 @@
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < m_cues->length(); ++i)
</span><span class="cx"> m_cues->item(i)->setTrack(0);
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> if (m_regions) {
</span><span class="cx"> for (size_t i = 0; i < m_regions->length(); ++i)
</span><span class="cx"> m_regions->item(i)->setTrack(0);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> clearClient();
</span><span class="cx"> }
</span><span class="lines">@@ -342,7 +338,6 @@
</span><span class="cx"> m_client->textTrackRemoveCue(this, cue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> VTTRegionList* TextTrack::ensureVTTRegionList()
</span><span class="cx"> {
</span><span class="cx"> if (!m_regions)
</span><span class="lines">@@ -414,7 +409,6 @@
</span><span class="cx">
</span><span class="cx"> region->setTrack(0);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void TextTrack::cueWillChange(TextTrackCue* cue)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrack.h (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -41,10 +41,8 @@
</span><span class="cx"> class ScriptExecutionContext;
</span><span class="cx"> class TextTrack;
</span><span class="cx"> class TextTrackCueList;
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> class VTTRegion;
</span><span class="cx"> class VTTRegionList;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> class TextTrackClient {
</span><span class="cx"> public:
</span><span class="lines">@@ -106,11 +104,9 @@
</span><span class="cx">
</span><span class="cx"> bool hasCue(TextTrackCue*, TextTrackCue::CueMatchRules = TextTrackCue::MatchAllFields);
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> VTTRegionList* regions();
</span><span class="cx"> void addRegion(PassRefPtr<VTTRegion>);
</span><span class="cx"> void removeRegion(VTTRegion*, ExceptionCode&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void cueWillChange(TextTrackCue*);
</span><span class="cx"> void cueDidChange(TextTrackCue*);
</span><span class="lines">@@ -162,10 +158,8 @@
</span><span class="cx"> virtual void refEventTarget() override final { ref(); }
</span><span class="cx"> virtual void derefEventTarget() override final { deref(); }
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> VTTRegionList* ensureVTTRegionList();
</span><span class="cx"> RefPtr<VTTRegionList> m_regions;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> TextTrackCueList* ensureTextTrackCueList();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrack.idl (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -50,9 +50,9 @@
</span><span class="cx"> attribute EventHandler oncuechange;
</span><span class="cx">
</span><span class="cx"> #if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT // Work around shortcomings in the gobject binding generator handling of conditional features by turning these off for gobject.
</span><del>- [Conditional=WEBVTT_REGIONS] readonly attribute VTTRegionList regions;
- [Conditional=WEBVTT_REGIONS] void addRegion(VTTRegion region);
- [Conditional=WEBVTT_REGIONS, RaisesException] void removeRegion(VTTRegion region);
</del><ins>+ readonly attribute VTTRegionList regions;
+ void addRegion(VTTRegion region);
+ [RaisesException] void removeRegion(VTTRegion region);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // EventTarget interface
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackCuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrackCue.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -47,13 +47,10 @@
</span><span class="cx"> #include "TextTrack.h"
</span><span class="cx"> #include "TextTrackCueList.h"
</span><span class="cx"> #include "VTTCue.h"
</span><ins>+#include "VTTRegionList.h"
</ins><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
-#include "VTTRegionList.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static const int invalidCueIndex = -1;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTCuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTCue.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,16 +46,13 @@
</span><span class="cx"> #include "Text.h"
</span><span class="cx"> #include "TextTrack.h"
</span><span class="cx"> #include "TextTrackCueList.h"
</span><ins>+#include "VTTRegionList.h"
</ins><span class="cx"> #include "VTTScanner.h"
</span><span class="cx"> #include "WebVTTElement.h"
</span><span class="cx"> #include "WebVTTParser.h"
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
-#include "VTTRegionList.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // This constant should correspond with the percentage returned by CaptionUserPreferences::captionFontSizeScaleAndImportance.
</span><span class="lines">@@ -144,12 +141,10 @@
</span><span class="cx"> void VTTCueBox::applyCSSProperties(const IntSize& videoSize)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Apply all the initial CSS positioning properties. http://wkb.ug/79916
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> if (!m_cue.regionId().isEmpty()) {
</span><span class="cx"> setInlineStyleProperty(CSSPropertyPosition, CSSValueRelative);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // 3.5.1 On the (root) List of WebVTT Node Objects:
</span><span class="cx">
</span><span class="lines">@@ -530,7 +525,6 @@
</span><span class="cx"> return clonedFragment.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> void VTTCue::setRegionId(const String& regionId)
</span><span class="cx"> {
</span><span class="cx"> if (m_regionId == regionId)
</span><span class="lines">@@ -545,7 +539,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_notifyRegion = notifyRegion;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void VTTCue::setIsActive(bool active)
</span><span class="cx"> {
</span><span class="lines">@@ -838,7 +831,6 @@
</span><span class="cx">
</span><span class="cx"> void VTTCue::removeDisplayTree()
</span><span class="cx"> {
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> // The region needs to be informed about the cue removal.
</span><span class="cx"> if (m_notifyRegion && track()) {
</span><span class="cx"> if (VTTRegionList* regions = track()->regions()) {
</span><span class="lines">@@ -846,7 +838,6 @@
</span><span class="cx"> region->willRemoveTextTrackCueBox(m_displayTree.get());
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (!hasDisplayTree())
</span><span class="cx"> return;
</span><span class="lines">@@ -904,10 +895,9 @@
</span><span class="cx"> parsedSetting = Size;
</span><span class="cx"> else if (input.scan("align"))
</span><span class="cx"> parsedSetting = Align;
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> else if (input.scan("region"))
</span><span class="cx"> parsedSetting = RegionId;
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> // Verify that a ':' follows.
</span><span class="cx"> if (parsedSetting != None && input.scan(':'))
</span><span class="cx"> return parsedSetting;
</span><span class="lines">@@ -1058,11 +1048,9 @@
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> case RegionId:
</span><span class="cx"> m_regionId = input.extractString(valueRun);
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> case None:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1070,7 +1058,7 @@
</span><span class="cx"> // Make sure the entire run is consumed.
</span><span class="cx"> input.skipRun(valueRun);
</span><span class="cx"> }
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><ins>+
</ins><span class="cx"> // If cue's line position is not auto or cue's size is not 100 or cue's
</span><span class="cx"> // writing direction is not horizontal, but cue's region identifier is not
</span><span class="cx"> // the empty string, let cue's region identifier be the empty string.
</span><span class="lines">@@ -1079,7 +1067,6 @@
</span><span class="cx">
</span><span class="cx"> if (m_linePosition != undefinedPosition || m_cueSize != 100 || m_writingDirection != Horizontal)
</span><span class="cx"> m_regionId = emptyString();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSValueID VTTCue::getCSSAlignment() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTCueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTCue.h (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -117,11 +117,9 @@
</span><span class="cx"> PassRefPtr<DocumentFragment> getCueAsHTML();
</span><span class="cx"> PassRefPtr<DocumentFragment> createCueRenderingTree();
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> const String& regionId() const { return m_regionId; }
</span><span class="cx"> void setRegionId(const String&);
</span><span class="cx"> void notifyRegionWhenRemovingDisplayTree(bool);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> virtual void setIsActive(bool) override;
</span><span class="cx">
</span><span class="lines">@@ -196,9 +194,7 @@
</span><span class="cx"> Position,
</span><span class="cx"> Size,
</span><span class="cx"> Align,
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> RegionId
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx"> CueSetting settingName(VTTScanner&);
</span><span class="cx">
</span><span class="lines">@@ -211,9 +207,7 @@
</span><span class="cx">
</span><span class="cx"> WritingDirection m_writingDirection;
</span><span class="cx"> CueAlignment m_cueAlignment;
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> String m_regionId;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> RefPtr<DocumentFragment> m_webVTTNodeTree;
</span><span class="cx"> RefPtr<HTMLSpanElement> m_cueHighlightBox;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTCueidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTCue.idl (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -38,7 +38,5 @@
</span><span class="cx"> attribute DOMString text;
</span><span class="cx"> DocumentFragment getCueAsHTML();
</span><span class="cx">
</span><del>-#if defined(ENABLE_WEBVTT_REGIONS) && ENABLE_WEBVTT_REGIONS
</del><span class="cx"> attribute DOMString regionId;
</span><del>-#endif
</del><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTRegioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTRegion.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "VTTRegion.h"
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
</del><ins>+#if ENABLE(VIDEO_TRACK)
</ins><span class="cx">
</span><span class="cx"> #include "ClientRect.h"
</span><span class="cx"> #include "DOMTokenList.h"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTRegionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTRegion.h (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #ifndef VTTRegion_h
</span><span class="cx"> #define VTTRegion_h
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
</del><ins>+#if ENABLE(VIDEO_TRACK)
</ins><span class="cx">
</span><span class="cx"> #include "ContextDestructionObserver.h"
</span><span class="cx"> #include "Document.h"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTRegionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTRegion.idl (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- Conditional=VIDEO_TRACK & WEBVTT_REGIONS,
</del><ins>+ Conditional=VIDEO_TRACK,
</ins><span class="cx"> JSGenerateToNativeObject,
</span><span class="cx"> Constructor(),
</span><span class="cx"> ConstructorCallWith=ScriptExecutionContext
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTRegionListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTRegionList.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "VTTRegionList.h"
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
</del><ins>+#if ENABLE(VIDEO_TRACK)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTRegionListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTRegionList.h (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #ifndef VTTRegionList_h
</span><span class="cx"> #define VTTRegionList_h
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
</del><ins>+#if ENABLE(VIDEO_TRACK)
</ins><span class="cx">
</span><span class="cx"> #include "VTTRegion.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTRegionListidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTRegionList.idl (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> NoInterfaceObject,
</span><del>- Conditional=VIDEO_TRACK & WEBVTT_REGIONS,
</del><ins>+ Conditional=VIDEO_TRACK,
</ins><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> ] interface VTTRegionList {
</span><span class="cx"> readonly attribute unsigned long length;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackWebVTTParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/WebVTTParser.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -67,7 +67,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> bool WebVTTParser::parseFloatPercentageValuePair(VTTScanner& valueScanner, char delimiter, FloatPoint& valuePair)
</span><span class="cx"> {
</span><span class="cx"> float firstCoord;
</span><span class="lines">@@ -84,7 +83,6 @@
</span><span class="cx"> valuePair = FloatPoint(firstCoord, secondCoord);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> WebVTTParser::WebVTTParser(WebVTTParserClient* client, ScriptExecutionContext* context)
</span><span class="cx"> : m_scriptExecutionContext(context)
</span><span class="lines">@@ -100,13 +98,11 @@
</span><span class="cx"> m_cuelist.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> void WebVTTParser::getNewRegions(Vector<RefPtr<VTTRegion>>& outputRegions)
</span><span class="cx"> {
</span><span class="cx"> outputRegions = m_regionList;
</span><span class="cx"> m_regionList.clear();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void WebVTTParser::parseFileHeader(const String& data)
</span><span class="cx"> {
</span><span class="lines">@@ -178,11 +174,9 @@
</span><span class="cx"> collectMetadataHeader(line);
</span><span class="cx">
</span><span class="cx"> if (line.isEmpty()) {
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> // Steps 10-14 - Allow a header (comment area) under the WEBVTT line.
</span><span class="cx"> if (m_client && m_regionList.size())
</span><span class="cx"> m_client->newRegionsParsed();
</span><del>-#endif
</del><span class="cx"> m_state = Id;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -266,7 +260,6 @@
</span><span class="cx">
</span><span class="cx"> void WebVTTParser::collectMetadataHeader(const String& line)
</span><span class="cx"> {
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> // WebVTT header parsing (WebVTT parser algorithm step 12)
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, regionHeaderName, ("Region", AtomicString::ConstructFromLiteral));
</span><span class="cx">
</span><span class="lines">@@ -285,9 +278,6 @@
</span><span class="cx"> // Steps 12.5.1 - 12.5.11 Region creation: Let region be a new text track region [...]
</span><span class="cx"> createNewRegion(headerValue);
</span><span class="cx"> }
</span><del>-#else
- UNUSED_PARAM(line);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebVTTParser::ParseState WebVTTParser::collectCueId(const String& line)
</span><span class="lines">@@ -441,7 +431,6 @@
</span><span class="cx"> m_currentContent.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> void WebVTTParser::createNewRegion(const String& headerValue)
</span><span class="cx"> {
</span><span class="cx"> if (headerValue.isEmpty())
</span><span class="lines">@@ -462,7 +451,6 @@
</span><span class="cx"> // Step 12.5.11
</span><span class="cx"> m_regionList.append(region);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool WebVTTParser::collectTimeStamp(const String& line, MediaTime& timeStamp)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackWebVTTParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/WebVTTParser.h (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -58,9 +58,7 @@
</span><span class="cx"> virtual ~WebVTTParserClient() { }
</span><span class="cx">
</span><span class="cx"> virtual void newCuesParsed() = 0;
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> virtual void newRegionsParsed() = 0;
</span><del>-#endif
</del><span class="cx"> virtual void fileFailedToParse() = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -132,9 +130,7 @@
</span><span class="cx">
</span><span class="cx"> // Useful functions for parsing percentage settings.
</span><span class="cx"> static bool parseFloatPercentageValue(VTTScanner& valueScanner, float&);
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> static bool parseFloatPercentageValuePair(VTTScanner& valueScanner, char, FloatPoint&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Input data to the parser to parse.
</span><span class="cx"> void parseBytes(const char*, unsigned);
</span><span class="lines">@@ -145,9 +141,7 @@
</span><span class="cx">
</span><span class="cx"> // Transfers ownership of last parsed cues to caller.
</span><span class="cx"> void getNewCues(Vector<RefPtr<WebVTTCueData>>&);
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> void getNewRegions(Vector<RefPtr<VTTRegion>>&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Create the DocumentFragment representation of the WebVTT cue text.
</span><span class="cx"> static PassRefPtr<DocumentFragment> createDocumentFragmentFromCueText(Document&, const String&);
</span><span class="lines">@@ -170,9 +164,7 @@
</span><span class="cx"> void resetCueValues();
</span><span class="cx">
</span><span class="cx"> void collectMetadataHeader(const String&);
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> void createNewRegion(const String& headerValue);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static bool collectTimeStamp(VTTScanner& input, MediaTime& timeStamp);
</span><span class="cx">
</span><span class="lines">@@ -187,10 +179,7 @@
</span><span class="cx"> WebVTTParserClient* m_client;
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<WebVTTCueData>> m_cuelist;
</span><del>-
-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> Vector<RefPtr<VTTRegion>> m_regionList;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderTextTrackLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/TextTrackLoader.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -187,12 +187,10 @@
</span><span class="cx"> m_cueLoadTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> void TextTrackLoader::newRegionsParsed()
</span><span class="cx"> {
</span><span class="cx"> m_client.newRegionsAvailable(this);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void TextTrackLoader::fileFailedToParse()
</span><span class="cx"> {
</span><span class="lines">@@ -218,14 +216,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> void TextTrackLoader::getNewRegions(Vector<RefPtr<VTTRegion>>& outputRegions)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_cueParser);
</span><span class="cx"> if (m_cueParser)
</span><span class="cx"> m_cueParser->getNewRegions(outputRegions);
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderTextTrackLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/TextTrackLoader.h (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -47,9 +47,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void newCuesAvailable(TextTrackLoader*) = 0;
</span><span class="cx"> virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) = 0;
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> virtual void newRegionsAvailable(TextTrackLoader*) = 0;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class TextTrackLoader : public CachedResourceClient, private WebVTTParserClient {
</span><span class="lines">@@ -62,9 +60,7 @@
</span><span class="cx"> bool load(const URL&, const String& crossOriginMode, bool isInitiatingElementInUserAgentShadowTree);
</span><span class="cx"> void cancelLoad();
</span><span class="cx"> void getNewCues(Vector<RefPtr<TextTrackCue>>& outputCues);
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> void getNewRegions(Vector<RefPtr<VTTRegion>>& outputRegions);
</span><del>-#endif
</del><span class="cx"> private:
</span><span class="cx">
</span><span class="cx"> // CachedResourceClient
</span><span class="lines">@@ -73,9 +69,7 @@
</span><span class="cx">
</span><span class="cx"> // WebVTTParserClient
</span><span class="cx"> virtual void newCuesParsed() override;
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> virtual void newRegionsParsed() override;
</span><del>-#endif
</del><span class="cx"> virtual void fileFailedToParse() override;
</span><span class="cx">
</span><span class="cx"> void processNewCueData(CachedResource*);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderVTTCuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderVTTCue.cpp (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -47,14 +47,12 @@
</span><span class="cx"> StackStats::LayoutCheckPoint layoutCheckPoint;
</span><span class="cx"> RenderBlockFlow::layout();
</span><span class="cx">
</span><del>-#if ENABLE(WEBVTT_REGIONS)
</del><span class="cx"> // If WebVTT Regions are used, the regular WebVTT layout algorithm is no
</span><span class="cx"> // longer necessary, since cues having the region parameter set do not have
</span><span class="cx"> // any positioning parameters. Also, in this case, the regions themselves
</span><span class="cx"> // have positioning information.
</span><span class="cx"> if (!m_cue->regionId().isEmpty())
</span><span class="cx"> return;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-08-19 Eric Carlson <eric.carlson@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.
+
</ins><span class="cx"> 2015-08-17 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace all remaining uses of WTF::Mutex with WTF::Lock
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -215,7 +215,6 @@
</span><span class="cx"> ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
</span><span class="cx"> ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
</span><span class="cx">
</span><del>-ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
</del><span class="cx"> ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove the USE_INTERNAL_SDK condition once we support XSLT when building for iOS with the
</span><span class="lines">@@ -229,4 +228,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx">
</span><del>-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);
</del><ins>+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);
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-08-19 Eric Carlson <eric.carlson@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.
+
</ins><span class="cx"> 2015-08-18 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Support CSS filters without webkit prefix
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (188659 => 188660)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -215,7 +215,6 @@
</span><span class="cx"> ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
</span><span class="cx"> ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
</span><span class="cx">
</span><del>-ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
</del><span class="cx"> ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove the USE_INTERNAL_SDK condition once we support XSLT when building for iOS with the
</span><span class="lines">@@ -229,4 +228,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx">
</span><del>-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);
</del><ins>+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);
</ins></span></pre>
</div>
</div>
</body>
</html>