<!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>[186652] 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/186652">186652</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-07-09 17:02:50 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: Inline media scrubbing always pauses the video
https://bugs.webkit.org/show_bug.cgi?id=146819
<rdar://problem/21572027>
Reviewed by Eric Carlson. Joseph Pecoraro also was really
helpful in diagnosing the problem.
When we moved some code from a getter/setter in the child
class to the base class, it was no longer being called due
to the bad way we were implementing inheritance. The solution
was to have the child class explicitly call into the base
class.
The much better solution would have been to rewrite everything
to use ES6 classes or, as a smaller change, assign the __proto__
directly on the child prototype. But I felt that was a bit
too risky at this point.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.extend): Describe in a comment why the extend function
is not suitable.
* Modules/mediacontrols/mediaControlsiOS.js: Add a getter/setter for
scrubbing that calls into the base Controller.</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="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186651 => 186652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-10 00:02:41 UTC (rev 186651)
+++ trunk/Source/WebCore/ChangeLog 2015-07-10 00:02:50 UTC (rev 186652)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-07-09 Dean Jackson <dino@apple.com>
+
+ REGRESSION: Inline media scrubbing always pauses the video
+ https://bugs.webkit.org/show_bug.cgi?id=146819
+ <rdar://problem/21572027>
+
+ Reviewed by Eric Carlson. Joseph Pecoraro also was really
+ helpful in diagnosing the problem.
+
+ When we moved some code from a getter/setter in the child
+ class to the base class, it was no longer being called due
+ to the bad way we were implementing inheritance. The solution
+ was to have the child class explicitly call into the base
+ class.
+
+ The much better solution would have been to rewrite everything
+ to use ES6 classes or, as a smaller change, assign the __proto__
+ directly on the child prototype. But I felt that was a bit
+ too risky at this point.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.extend): Describe in a comment why the extend function
+ is not suitable.
+ * Modules/mediacontrols/mediaControlsiOS.js: Add a getter/setter for
+ scrubbing that calls into the base Controller.
+
</ins><span class="cx"> 2015-07-09 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: <details> element should allow expand/close through AX API
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (186651 => 186652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-07-10 00:02:41 UTC (rev 186651)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-07-10 00:02:50 UTC (rev 186652)
</span><span class="lines">@@ -132,6 +132,12 @@
</span><span class="cx">
</span><span class="cx"> extend: function(child)
</span><span class="cx"> {
</span><ins>+ // This function doesn't actually do what we want it to. In particular it
+ // is not copying the getters and setters to the child class, since they are
+ // not enumerable. What we should do is use ES6 classes, or assign the __proto__
+ // directly.
+ // FIXME: Use ES6 classes.
+
</ins><span class="cx"> for (var property in this) {
</span><span class="cx"> if (!child.hasOwnProperty(property))
</span><span class="cx"> child[property] = this[property];
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (186651 => 186652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-07-10 00:02:41 UTC (rev 186651)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-07-10 00:02:50 UTC (rev 186652)
</span><span class="lines">@@ -630,6 +630,21 @@
</span><span class="cx"> return Controller.prototype.controlsAlwaysVisible.call(this);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ // Due to the bad way we are faking inheritance here, in particular the extends method
+ // on Controller.prototype, we don't copy getters and setters from the prototype. This
+ // means we have to implement them again, here in the subclass.
+ // FIXME: Use ES6 classes!
+
+ get scrubbing()
+ {
+ return Object.getOwnPropertyDescriptor(Controller.prototype, "scrubbing").get.call(this);
+ },
+
+ set scrubbing(flag)
+ {
+ Object.getOwnPropertyDescriptor(Controller.prototype, "scrubbing").set.call(this, flag);
+ },
+
</ins><span class="cx"> get pageScaleFactor()
</span><span class="cx"> {
</span><span class="cx"> return this._pageScaleFactor;
</span></span></pre>
</div>
</div>
</body>
</html>