<!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>[168479] trunk/Source/WebCore</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/168479">168479</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-05-08 12:03:38 -0700 (Thu, 08 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cue display events may not be registered during page load.
https://bugs.webkit.org/show_bug.cgi?id=132696
<rdar://problem/16652874>
Reviewed by Eric Carlson.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.handleTextTrackAdd): Don't register
for 'cuechange' events anymore.
(Controller.prototype.handleTextTrackRemove): Ditto.
(Controller.prototype.updateCaptionContainer): Reduce CSS
churn by not adding/removing 'Hidden' class every time a
new cue is processed. Only do this when transitioning
track display state.
(Controller.prototype.handleTextTrackCueChange): Deleted.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::updateTextTrackDisplay): Call
'updateTextTrackContainer' directory when processing cues,
rather than trampolining through the JS layer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168478 => 168479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-08 18:33:18 UTC (rev 168478)
+++ trunk/Source/WebCore/ChangeLog 2014-05-08 19:03:38 UTC (rev 168479)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-05-08 Brent Fulgham <bfulgham@apple.com>
+
+ Cue display events may not be registered during page load.
+ https://bugs.webkit.org/show_bug.cgi?id=132696
+ <rdar://problem/16652874>
+
+ Reviewed by Eric Carlson.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.handleTextTrackAdd): Don't register
+ for 'cuechange' events anymore.
+ (Controller.prototype.handleTextTrackRemove): Ditto.
+ (Controller.prototype.updateCaptionContainer): Reduce CSS
+ churn by not adding/removing 'Hidden' class every time a
+ new cue is processed. Only do this when transitioning
+ track display state.
+ (Controller.prototype.handleTextTrackCueChange): Deleted.
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::updateTextTrackDisplay): Call
+ 'updateTextTrackContainer' directory when processing cues,
+ rather than trampolining through the JS layer.
+
</ins><span class="cx"> 2014-05-08 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Make BlobDataFileReference manage its sandbox extension
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (168478 => 168479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-05-08 18:33:18 UTC (rev 168478)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-05-08 19:03:38 UTC (rev 168479)
</span><span class="lines">@@ -571,7 +571,6 @@
</span><span class="cx"> handleTextTrackAdd: function(event)
</span><span class="cx"> {
</span><span class="cx"> var track = event.track;
</span><del>- this.listenFor(track, 'cuechange', this.handleTextTrackCueChange);
</del><span class="cx">
</span><span class="cx"> if (this.trackHasThumbnails(track) && track.mode === 'disabled')
</span><span class="cx"> track.mode = 'hidden';
</span><span class="lines">@@ -583,18 +582,11 @@
</span><span class="cx">
</span><span class="cx"> handleTextTrackRemove: function(event)
</span><span class="cx"> {
</span><del>- var track = event.track;
- this.stopListeningFor(track, 'cuechange', this.handleTextTrackCueChange);
</del><span class="cx"> this.updateThumbnail();
</span><span class="cx"> this.updateCaptionButton();
</span><span class="cx"> this.updateCaptionContainer();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- handleTextTrackCueChange: function(event)
- {
- this.updateCaptionContainer();
- },
-
</del><span class="cx"> isFullScreen: function()
</span><span class="cx"> {
</span><span class="cx"> return document.webkitCurrentFullScreenElement === this.video;
</span><span class="lines">@@ -1049,9 +1041,12 @@
</span><span class="cx"> if (!this.host.textTrackContainer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (this.video.webkitHasClosedCaptions)
</del><ins>+ var hasClosedCaptions = this.video.webkitHasClosedCaptions;
+ var hasHiddenClass = this.host.textTrackContainer.classList.contains(this.ClassNames.hidden);
+
+ if (hasClosedCaptions && hasHiddenClass)
</ins><span class="cx"> this.host.textTrackContainer.classList.remove(this.ClassNames.hidden);
</span><del>- else
</del><ins>+ else if (!hasClosedCaptions && !hasHiddenClass)
</ins><span class="cx"> this.host.textTrackContainer.classList.add(this.ClassNames.hidden);
</span><span class="cx">
</span><span class="cx"> this.updateBase();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (168478 => 168479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-08 18:33:18 UTC (rev 168478)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-08 19:03:38 UTC (rev 168479)
</span><span class="lines">@@ -4939,6 +4939,8 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> ensureUserAgentShadowRoot();
</span><ins>+ ASSERT(m_mediaControlsHost);
+ m_mediaControlsHost->updateTextTrackContainer();
</ins><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx"> if (!hasMediaControls() && !createMediaControls())
</span></span></pre>
</div>
</div>
</body>
</html>