<!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>[183705] 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/183705">183705</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-01 18:11:28 -0700 (Fri, 01 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Postpone caption style sheet creation
https://bugs.webkit.org/show_bug.cgi?id=144499
Reviewed by Simon Fraser.
Source/WebCore:
Generating and inserting the caption user style sheet is expensive so don't do it until
we see a text track, and only do it for the first video element in a PageGroup.
Test: media/track/track-user-stylesheet.html
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::registerWithDocument): Only register for caption preferences
changes if we have done so before.
(WebCore::HTMLMediaElement::unregisterWithDocument): Only unregister for caption preferences
changes if we registered for them.
(WebCore::HTMLMediaElement::addTextTrack): Register for caption preference changes.
* html/HTMLMediaElement.h:
* page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::CaptionUserPreferencesMediaAF::setInterestedInCaptionPreferenceChanges): Only
generate the style sheet when called for the first time.
LayoutTests:
* media/track/track-user-stylesheet-expected.txt: Added.
* media/track/track-user-stylesheet.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp">trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediatracktrackuserstylesheetexpectedtxt">trunk/LayoutTests/media/track/track-user-stylesheet-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackuserstylesheethtml">trunk/LayoutTests/media/track/track-user-stylesheet.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183704 => 183705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-02 00:55:03 UTC (rev 183704)
+++ trunk/LayoutTests/ChangeLog 2015-05-02 01:11:28 UTC (rev 183705)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-01 Eric Carlson <eric.carlson@apple.com>
+
+ Postpone caption style sheet creation
+ https://bugs.webkit.org/show_bug.cgi?id=144499
+
+ Reviewed by Simon Fraser.
+
+ * media/track/track-user-stylesheet-expected.txt: Added.
+ * media/track/track-user-stylesheet.html: Added.
+
</ins><span class="cx"> 2015-05-01 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [OS X] Text dilation parameters are not restored after being set
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackuserstylesheetexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/track-user-stylesheet-expected.txt (0 => 183705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-user-stylesheet-expected.txt (rev 0)
+++ trunk/LayoutTests/media/track/track-user-stylesheet-expected.txt 2015-05-02 01:11:28 UTC (rev 183705)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+Test that caption preferences change notifications work
+
+RUN(internals.setCaptionDisplayMode('AlwaysOn'))
+RUN(internals.setCaptionsStyleSheetOverride('video::cue { color: blue; background-color: yellow; }'))
+RUN(internals.settings.setShouldDisplayTrackKind('Captions', true))
+
+EVENT(canplaythrough)
+
+RUN(video.currentTime = .5)
+
+EVENT(seeked)
+
+** Track should be visible, cue should be styled appropriately. **
+EXPECTED (video.textTracks[0].mode == 'showing') OK
+EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).color == 'rgb(0, 0, 255)') OK
+EXPECTED (getComputedStyle(textTrackDisplayElement(video, 'cue')).backgroundColor == 'rgb(255, 255, 0)') OK
+
+** Remove the video from the document, add it back. **
+RUN(video.parentNode.removeChild(video))
+RUN(document.body.appendChild(video))
+
+** Change caption display mode to generate a notification. **
+RUN(setCaptionDisplayMode('ForcedOnly'))
+
+** Track should not be visible. **
+EXPECTED (video.textTracks[0].mode == 'disabled') OK
+
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackuserstylesheethtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/track-user-stylesheet.html (0 => 183705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-user-stylesheet.html (rev 0)
+++ trunk/LayoutTests/media/track/track-user-stylesheet.html 2015-05-02 01:11:28 UTC (rev 183705)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <script src=../media-file.js></script>
+ <script src=../video-test.js></script>
+ <script src=../media-controls.js></script>
+
+ <script>
+ function finishTest()
+ {
+ consoleWrite("<br>** Track should not be visible. **");
+ testExpected("video.textTracks[0].mode", "disabled");
+
+ consoleWrite("");
+ endTest();
+ }
+
+ function seeked()
+ {
+ consoleWrite("<br>** Track should be visible, cue should be styled appropriately. **");
+ testExpected("video.textTracks[0].mode", "showing");
+ testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).color", "rgb(0, 0, 255)");
+ testExpected("getComputedStyle(textTrackDisplayElement(video, 'cue')).backgroundColor", "rgb(255, 255, 0)");
+
+ consoleWrite("<br>** Remove the video from the document, add it back. **");
+ run("video.parentNode.removeChild(video)");
+ run("document.body.appendChild(video)");
+
+ consoleWrite("<br>** Change caption display mode to generate a notification. **");
+ run("setCaptionDisplayMode('ForcedOnly')");
+
+ // The notification is sent asynchronously, so check after a brief pause.
+ timer = setTimeout(finishTest, 100);
+ }
+
+ function canplaythrough()
+ {
+ consoleWrite("");
+ run("video.currentTime = .5");
+ consoleWrite("");
+ }
+
+ function loaded()
+ {
+ consoleWrite("");
+ run("internals.setCaptionDisplayMode('AlwaysOn')");
+ run("internals.setCaptionsStyleSheetOverride('video::cue { color: blue; background-color: yellow; }')");
+ run("internals.settings.setShouldDisplayTrackKind('Captions', true)");
+
+ findMediaElement();
+ video.src = findMediaFile('video', '../content/test');
+ waitForEvent('seeked', seeked);
+ waitForEvent('canplaythrough', canplaythrough);
+ consoleWrite("");
+ }
+
+ </script>
+ </head>
+ <body onload="loaded()">
+ <span>Test that caption preferences change notifications work</span>
+ <video controls >
+ <track src="captions-webvtt/styling.vtt" kind="captions">
+ </video>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183704 => 183705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-02 00:55:03 UTC (rev 183704)
+++ trunk/Source/WebCore/ChangeLog 2015-05-02 01:11:28 UTC (rev 183705)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-05-01 Eric Carlson <eric.carlson@apple.com>
+
+ Postpone caption style sheet creation
+ https://bugs.webkit.org/show_bug.cgi?id=144499
+
+ Reviewed by Simon Fraser.
+
+ Generating and inserting the caption user style sheet is expensive so don't do it until
+ we see a text track, and only do it for the first video element in a PageGroup.
+
+ Test: media/track/track-user-stylesheet.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::registerWithDocument): Only register for caption preferences
+ changes if we have done so before.
+ (WebCore::HTMLMediaElement::unregisterWithDocument): Only unregister for caption preferences
+ changes if we registered for them.
+ (WebCore::HTMLMediaElement::addTextTrack): Register for caption preference changes.
+ * html/HTMLMediaElement.h:
+
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::CaptionUserPreferencesMediaAF::setInterestedInCaptionPreferenceChanges): Only
+ generate the style sheet when called for the first time.
+
</ins><span class="cx"> 2015-05-01 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Scrubber display is broken if the buffered range is empty
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (183704 => 183705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-02 00:55:03 UTC (rev 183704)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-02 01:11:28 UTC (rev 183705)
</span><span class="lines">@@ -448,7 +448,8 @@
</span><span class="cx"> document.registerForVisibilityStateChangedCallbacks(this);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- document.registerForCaptionPreferencesChangedCallbacks(this);
</del><ins>+ if (m_requireCaptionPreferencesChangedCallbacks)
+ document.registerForCaptionPreferencesChangedCallbacks(this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="lines">@@ -475,7 +476,8 @@
</span><span class="cx"> document.unregisterForVisibilityStateChangedCallbacks(this);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- document.unregisterForCaptionPreferencesChangedCallbacks(this);
</del><ins>+ if (m_requireCaptionPreferencesChangedCallbacks)
+ document.unregisterForCaptionPreferencesChangedCallbacks(this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="lines">@@ -3363,6 +3365,11 @@
</span><span class="cx"> if (!RuntimeEnabledFeatures::sharedFeatures().webkitVideoTrackEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!m_requireCaptionPreferencesChangedCallbacks) {
+ m_requireCaptionPreferencesChangedCallbacks = true;
+ document().registerForCaptionPreferencesChangedCallbacks(this);
+ }
+
</ins><span class="cx"> textTracks()->append(track);
</span><span class="cx">
</span><span class="cx"> closeCaptionTracksChanged();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (183704 => 183705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-05-02 00:55:03 UTC (rev 183704)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-05-02 01:11:28 UTC (rev 183705)
</span><span class="lines">@@ -884,6 +884,8 @@
</span><span class="cx">
</span><span class="cx"> CueList m_currentlyActiveCues;
</span><span class="cx"> int m_ignoreTrackDisplayUpdate;
</span><ins>+
+ bool m_requireCaptionPreferencesChangedCallbacks { false };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_AUDIO)
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (183704 => 183705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2015-05-02 00:55:03 UTC (rev 183704)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2015-05-02 01:11:28 UTC (rev 183705)
</span><span class="lines">@@ -185,23 +185,22 @@
</span><span class="cx">
</span><span class="cx"> void CaptionUserPreferencesMediaAF::setInterestedInCaptionPreferenceChanges()
</span><span class="cx"> {
</span><ins>+ if (m_listeningForPreferenceChanges)
+ return;
+
</ins><span class="cx"> if (!MediaAccessibilityLibrary())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!kMAXCaptionAppearanceSettingsChangedNotification)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_listeningForPreferenceChanges) {
- m_listeningForPreferenceChanges = true;
- m_registeringForNotification = true;
- CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(), this, userCaptionPreferencesChangedNotificationCallback, kMAXCaptionAppearanceSettingsChangedNotification, 0, CFNotificationSuspensionBehaviorCoalesce);
- m_registeringForNotification = false;
- }
</del><ins>+ m_listeningForPreferenceChanges = true;
+ m_registeringForNotification = true;
+ CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(), this, userCaptionPreferencesChangedNotificationCallback, kMAXCaptionAppearanceSettingsChangedNotification, 0, CFNotificationSuspensionBehaviorCoalesce);
+ m_registeringForNotification = false;
</ins><span class="cx">
</span><span class="cx"> // Generating and registering the caption stylesheet can be expensive and this method is called indirectly when the parser creates an audio or
</span><span class="cx"> // video element, so do it after a brief pause.
</span><del>- if (m_updateStyleSheetTimer.isActive())
- m_updateStyleSheetTimer.stop();
</del><span class="cx"> m_updateStyleSheetTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>