<!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>[189023] 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/189023">189023</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-08-27 07:46:08 -0700 (Thu, 27 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Initial infrastructure of media controls testing
https://bugs.webkit.org/show_bug.cgi?id=148426
<rdar://problem/22417286>
Reviewed by Eric Carlson.
Source/WebCore:
Expose a JS API from Internals that allows a layout test
to ask the controls instance what it thinks it is
doing.
Test: media/controls/basic.html
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.getCurrentControlsStatus): New method. Currently
returns a simple JSON string.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::getCurrentMediaControlsStatus): Call into
the controls instance.
* html/HTMLMediaElement.h:
* testing/Internals.cpp:
(WebCore::Internals::getCurrentMediaControlsStatusForElement): Link
between the Internals API and the HTMLMediaElement.
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
Very simple test that calls into the status object
of the media controls instance.
* media/controls/basic-expected.txt: Added.
* media/controls/basic.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="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</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="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/media/controls/</li>
<li><a href="#trunkLayoutTestsmediacontrolsbasicexpectedtxt">trunk/LayoutTests/media/controls/basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediacontrolsbasichtml">trunk/LayoutTests/media/controls/basic.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189022 => 189023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-27 14:26:20 UTC (rev 189022)
+++ trunk/LayoutTests/ChangeLog 2015-08-27 14:46:08 UTC (rev 189023)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-08-27 Dean Jackson <dino@apple.com>
+
+ Initial infrastructure of media controls testing
+ https://bugs.webkit.org/show_bug.cgi?id=148426
+ <rdar://problem/22417286>
+
+ Reviewed by Eric Carlson.
+
+ Very simple test that calls into the status object
+ of the media controls instance.
+
+ * media/controls/basic-expected.txt: Added.
+ * media/controls/basic.html: Added.
+
</ins><span class="cx"> 2015-08-26 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a Layout test for r188991
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontrolsbasicexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/controls/basic-expected.txt (0 => 189023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/basic-expected.txt (rev 0)
+++ trunk/LayoutTests/media/controls/basic-expected.txt 2015-08-27 14:46:08 UTC (rev 189023)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+This is a basic test of the internal controls status API.
+
+This test only runs in DRT!
+
+
+EVENT(canplaythrough)
+TEST(currentStatus != null) OK
+EXPECTED (currentStatus.status == 'ok') OK
+END OF TEST
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/media/controls/basic-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsmediacontrolsbasichtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/controls/basic.html (0 => 189023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/basic.html (rev 0)
+++ trunk/LayoutTests/media/controls/basic.html 2015-08-27 14:46:08 UTC (rev 189023)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="../media-file.js"></script>
+ <script src="../video-test.js"></script>
+ <script>
+ var video;
+ var currentStatus;
+
+ function init()
+ {
+ findMediaElement();
+ video.src = findMediaFile("video", "../content/test");
+
+ waitForEvent("canplaythrough", canplaythrough);
+ waitForEventAndFail("error");
+ }
+
+ function canplaythrough()
+ {
+ if (!window.testRunner)
+ return;
+
+ currentStatus = JSON.parse(internals.getCurrentMediaControlsStatusForElement(video));
+ test("currentStatus != null");
+ if (currentStatus)
+ testExpected("currentStatus.status", "ok");
+ endTest();
+ }
+ </script>
+ </head>
+ <body onload="init()">
+ <p>This is a basic test of the internal controls status API.</p>
+ <p>This test only runs in DRT!</p>
+ <video controls></video>
+ </body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/media/controls/basic.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189022 => 189023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-27 14:26:20 UTC (rev 189022)
+++ trunk/Source/WebCore/ChangeLog 2015-08-27 14:46:08 UTC (rev 189023)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-08-27 Dean Jackson <dino@apple.com>
+
+ Initial infrastructure of media controls testing
+ https://bugs.webkit.org/show_bug.cgi?id=148426
+ <rdar://problem/22417286>
+
+ Reviewed by Eric Carlson.
+
+ Expose a JS API from Internals that allows a layout test
+ to ask the controls instance what it thinks it is
+ doing.
+
+ Test: media/controls/basic.html
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.getCurrentControlsStatus): New method. Currently
+ returns a simple JSON string.
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::getCurrentMediaControlsStatus): Call into
+ the controls instance.
+ * html/HTMLMediaElement.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::getCurrentMediaControlsStatusForElement): Link
+ between the Internals API and the HTMLMediaElement.
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2015-08-27 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Move RenderThemeEfl.cpp|h from WebCore/platform/efl to WebCore/rendering
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (189022 => 189023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-08-27 14:26:20 UTC (rev 189022)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-08-27 14:46:08 UTC (rev 189023)
</span><span class="lines">@@ -2087,6 +2087,13 @@
</span><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span><span class="cx"> this.updateTimelineMetricsIfNeeded();
</span><span class="cx"> this.drawTimelineBackground();
</span><ins>+ },
+
+ getCurrentControlsStatus: function ()
+ {
+ return JSON.stringify({
+ status: "ok"
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (189022 => 189023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-27 14:26:20 UTC (rev 189022)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-27 14:46:08 UTC (rev 189023)
</span><span class="lines">@@ -6280,6 +6280,39 @@
</span><span class="cx">
</span><span class="cx"> setPageScaleFactorProperty(exec, controllerValue, page->pageScaleFactor());
</span><span class="cx"> }
</span><ins>+
+String HTMLMediaElement::getCurrentMediaControlsStatus()
+{
+ DOMWrapperWorld& world = ensureIsolatedWorld();
+ ScriptController& scriptController = document().frame()->script();
+ JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
+ JSC::ExecState* exec = globalObject->globalExec();
+ JSC::JSLockHolder lock(exec);
+
+ JSC::JSValue controllerValue = controllerJSValue(*exec, *globalObject, *this);
+ JSC::JSObject* controllerObject = controllerValue.toObject(exec);
+
+ if (exec->hadException())
+ return "";
+
+ JSC::JSValue functionValue = controllerObject->get(exec, JSC::Identifier::fromString(exec, "getCurrentControlsStatus"));
+ if (exec->hadException() || functionValue.isUndefinedOrNull())
+ return "";
+
+ JSC::JSObject* function = functionValue.toObject(exec);
+ JSC::CallData callData;
+ JSC::CallType callType = function->methodTable()->getCallData(function, callData);
+ JSC::MarkedArgumentBuffer argList;
+ if (callType == JSC::CallTypeNone)
+ return "";
+
+ JSC::JSValue outputValue = JSC::call(exec, function, callType, callData, controllerObject, argList);
+
+ if (exec->hadException())
+ return "";
+
+ return outputValue.getString(exec);
+}
</ins><span class="cx"> #endif // ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx">
</span><span class="cx"> unsigned long long HTMLMediaElement::fileSize() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (189022 => 189023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-08-27 14:26:20 UTC (rev 189022)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-08-27 14:46:08 UTC (rev 189023)
</span><span class="lines">@@ -434,6 +434,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> void pageScaleFactorChanged();
</span><ins>+ WEBCORE_EXPORT String getCurrentMediaControlsStatus();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> MediaControlsHost* mediaControlsHost() { return m_mediaControlsHost.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (189022 => 189023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-08-27 14:26:20 UTC (rev 189022)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-08-27 14:46:08 UTC (rev 189023)
</span><span class="lines">@@ -3052,4 +3052,18 @@
</span><span class="cx"> return pathString;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+String Internals::getCurrentMediaControlsStatusForElement(HTMLMediaElement* mediaElement)
+{
+#if !ENABLE(MEDIA_CONTROLS_SCRIPT)
+ UNUSED_PARAM(mediaElement);
+ return String();
+#else
+ if (!mediaElement)
+ return String();
+
+ return mediaElement->getCurrentMediaControlsStatus();
+#endif
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (189022 => 189023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2015-08-27 14:26:20 UTC (rev 189022)
+++ trunk/Source/WebCore/testing/Internals.h 2015-08-27 14:46:08 UTC (rev 189023)
</span><span class="lines">@@ -431,6 +431,8 @@
</span><span class="cx">
</span><span class="cx"> String pathStringWithShrinkWrappedRects(Vector<double> rectComponents, double radius, ExceptionCode&);
</span><span class="cx">
</span><ins>+ String getCurrentMediaControlsStatusForElement(HTMLMediaElement*);
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit Internals(Document*);
</span><span class="cx"> Document* contextDocument() const;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (189022 => 189023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2015-08-27 14:26:20 UTC (rev 189022)
+++ trunk/Source/WebCore/testing/Internals.idl 2015-08-27 14:46:08 UTC (rev 189023)
</span><span class="lines">@@ -399,4 +399,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> [RaisesException] DOMString pathStringWithShrinkWrappedRects(sequence<double> rectComponents, double radius);
</span><ins>+
+ DOMString getCurrentMediaControlsStatusForElement(HTMLMediaElement element);
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>