<!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>[167983] 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/167983">167983</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-29 22:42:57 -0700 (Tue, 29 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/167962">r167962</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/167975">r167975</a>.
https://bugs.webkit.org/show_bug.cgi?id=132376
Mysteriously broke many tests (Requested by ap on #webkit).
Reverted changesets:
"[Mac, iOS] Support caption activation via JS
webkitHasClosedCaptions method"
https://bugs.webkit.org/show_bug.cgi?id=132320
http://trac.webkit.org/changeset/167962
"Unreviewed test fix after <a href="http://trac.webkit.org/projects/webkit/changeset/167962">r167962</a>."
http://trac.webkit.org/changeset/167975</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</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="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementsh">trunk/Source/WebCore/html/shadow/MediaControlElements.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167982 => 167983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-30 05:15:34 UTC (rev 167982)
+++ trunk/Source/WebCore/ChangeLog 2014-04-30 05:42:57 UTC (rev 167983)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-04-29 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r167962 and r167975.
+ https://bugs.webkit.org/show_bug.cgi?id=132376
+
+ Mysteriously broke many tests (Requested by ap on #webkit).
+
+ Reverted changesets:
+
+ "[Mac, iOS] Support caption activation via JS
+ webkitHasClosedCaptions method"
+ https://bugs.webkit.org/show_bug.cgi?id=132320
+ http://trac.webkit.org/changeset/167962
+
+ "Unreviewed test fix after r167962."
+ http://trac.webkit.org/changeset/167975
+
</ins><span class="cx"> 2014-04-29 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Multiple tests assert in RenderGeometryMap
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (167982 => 167983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-04-30 05:15:34 UTC (rev 167982)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-04-30 05:42:57 UTC (rev 167983)
</span><span class="lines">@@ -22,10 +22,6 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-.hidden {
- display: none;
-}
-
</del><span class="cx"> audio {
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 25px;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (167982 => 167983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-30 05:15:34 UTC (rev 167982)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-30 05:42:57 UTC (rev 167983)
</span><span class="lines">@@ -3695,64 +3695,9 @@
</span><span class="cx"> m_webkitLegacyClosedCaptionOverride = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateCaptionContainer();
-
</del><span class="cx"> m_processingPreferenceChange = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::updateCaptionContainer()
-{
- LOG(Media, "HTMLMediaElement::updateCaptionContainer");
-#if ENABLE(MEDIA_CONTROLS_SCRIPT)
- Page* page = document().page();
- if (!page)
- return;
-
- DOMWrapperWorld& world = ensureIsolatedWorld();
-
- if (!ensureMediaControlsInjectedScript())
- return;
-
- ensureUserAgentShadowRoot();
-
- ASSERT(m_mediaControlsHost);
-
- ScriptController& scriptController = page->mainFrame().script();
- JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
- JSC::ExecState* exec = globalObject->globalExec();
- JSC::JSLockHolder lock(exec);
-
- JSC::JSValue controllerValue = m_mediaControlsHost->controllerJSValue();
- if (controllerValue.isUndefinedOrNull() || !controllerValue.isObject())
- return;
-
- JSC::JSObject* controllerObject = controllerValue.toObject(exec);
-
- // The media controls script must provide a method on the Controller object with the following details.
- // Name: updateCaptionContainer
- // Parameters:
- // None
- // Return value:
- // None
- JSC::JSValue methodValue = controllerObject->get(exec, JSC::Identifier(exec, "updateCaptionContainer"));
- if (methodValue.isUndefinedOrNull() || !methodValue.isObject())
- return;
-
- JSC::JSObject* methodObject = methodValue.toObject(exec);
-
- JSC::CallData callData;
- JSC::CallType callType = methodObject->methodTable()->getCallData(methodObject, callData);
- if (callType == JSC::CallTypeNone)
- return;
-
- JSC::MarkedArgumentBuffer noArguments;
- JSC::call(exec, methodObject, callType, callData, controllerObject, noArguments);
-
- if (exec->hadException())
- exec->clearException();
-#endif
-}
-
</del><span class="cx"> void HTMLMediaElement::setSelectedTextTrack(TextTrack* trackToSelect)
</span><span class="cx"> {
</span><span class="cx"> TextTrackList* trackList = textTracks();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (167982 => 167983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-04-30 05:15:34 UTC (rev 167982)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-04-30 05:42:57 UTC (rev 167983)
</span><span class="lines">@@ -721,8 +721,6 @@
</span><span class="cx"> void registerWithDocument(Document&);
</span><span class="cx"> void unregisterWithDocument(Document&);
</span><span class="cx">
</span><del>- void updateCaptionContainer();
-
</del><span class="cx"> Timer<HTMLMediaElement> m_loadTimer;
</span><span class="cx"> Timer<HTMLMediaElement> m_progressEventTimer;
</span><span class="cx"> Timer<HTMLMediaElement> m_playbackProgressTimer;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (167982 => 167983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-04-30 05:15:34 UTC (rev 167982)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-04-30 05:42:57 UTC (rev 167983)
</span><span class="lines">@@ -1500,17 +1500,6 @@
</span><span class="cx"> updateSizes();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaControlTextTrackContainerElement::hide()
-{
- classList()->add("hidden", IGNORE_EXCEPTION);
-}
-
-void MediaControlTextTrackContainerElement::show()
-{
- classList()->remove("hidden", IGNORE_EXCEPTION);
-}
-
-
</del><span class="cx"> #endif // ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><span class="cx"> // ----------------------------
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.h (167982 => 167983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.h 2014-04-30 05:15:34 UTC (rev 167982)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.h 2014-04-30 05:42:57 UTC (rev 167983)
</span><span class="lines">@@ -476,9 +476,6 @@
</span><span class="cx"> void exitedFullscreen();
</span><span class="cx"> static const AtomicString& textTrackContainerElementShadowPseudoId();
</span><span class="cx">
</span><del>- virtual void show() override;
- virtual void hide() override;
-
</del><span class="cx"> private:
</span><span class="cx"> void updateTimerFired(Timer<MediaControlTextTrackContainerElement>&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>