<!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>[181882] 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/181882">181882</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-03-23 17:44:22 -0700 (Mon, 23 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Timelines are sharing the same canvas background
https://bugs.webkit.org/show_bug.cgi?id=142994
<rdar://problem/20209466>
Reviewed by Brent Fulgham.
Since each MediaControl lives in an isolated world, we
can't rely on a global variable to provide a unique
identifier for a named canvas. The fix is to expose
WebCore's UUID generator, and have each canvas use
that for a name.
* Modules/mediacontrols/MediaControlsHost.cpp:
(WebCore::MediaControlsHost::generateUUID): New method on the
MediaControlsHost that generates a UUID.
* Modules/mediacontrols/MediaControlsHost.h:
* Modules/mediacontrols/MediaControlsHost.idl:
* Modules/mediacontrols/mediaControlsApple.js: Remove the global
variable unique ID that wasn't working, and instead get
an ID from the MediaControlsHost.
(Controller.prototype.createControls):
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl</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 (181881 => 181882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-23 23:42:40 UTC (rev 181881)
+++ trunk/Source/WebCore/ChangeLog 2015-03-24 00:44:22 UTC (rev 181882)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-03-23 Dean Jackson <dino@apple.com>
+
+ Timelines are sharing the same canvas background
+ https://bugs.webkit.org/show_bug.cgi?id=142994
+ <rdar://problem/20209466>
+
+ Reviewed by Brent Fulgham.
+
+ Since each MediaControl lives in an isolated world, we
+ can't rely on a global variable to provide a unique
+ identifier for a named canvas. The fix is to expose
+ WebCore's UUID generator, and have each canvas use
+ that for a name.
+
+ * Modules/mediacontrols/MediaControlsHost.cpp:
+ (WebCore::MediaControlsHost::generateUUID): New method on the
+ MediaControlsHost that generates a UUID.
+ * Modules/mediacontrols/MediaControlsHost.h:
+ * Modules/mediacontrols/MediaControlsHost.idl:
+
+ * Modules/mediacontrols/mediaControlsApple.js: Remove the global
+ variable unique ID that wasn't working, and instead get
+ an ID from the MediaControlsHost.
+ (Controller.prototype.createControls):
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS):
+
</ins><span class="cx"> 2015-03-23 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Scroll latching logic can get stuck in 'scrollable="no"' iframes
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (181881 => 181882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2015-03-23 23:42:40 UTC (rev 181881)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2015-03-24 00:44:22 UTC (rev 181882)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "PageGroup.h"
</span><span class="cx"> #include "TextTrack.h"
</span><span class="cx"> #include "TextTrackList.h"
</span><ins>+#include "UUID.h"
</ins><span class="cx"> #include <runtime/JSCJSValueInlines.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -292,6 +293,11 @@
</span><span class="cx"> return emptyString();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String MediaControlsHost::generateUUID() const
+{
+ return createCanonicalUUIDString();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h (181881 => 181882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2015-03-23 23:42:40 UTC (rev 181881)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2015-03-24 00:44:22 UTC (rev 181882)
</span><span class="lines">@@ -80,6 +80,8 @@
</span><span class="cx"> bool controlsDependOnPageScaleFactor() const;
</span><span class="cx"> void setControlsDependOnPageScaleFactor(bool v);
</span><span class="cx">
</span><ins>+ String generateUUID() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> MediaControlsHost(HTMLMediaElement*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl (181881 => 181882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2015-03-23 23:42:40 UTC (rev 181881)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2015-03-24 00:44:22 UTC (rev 181882)
</span><span class="lines">@@ -62,4 +62,6 @@
</span><span class="cx"> void exitedFullscreen();
</span><span class="cx"> void enterFullscreenOptimized();
</span><span class="cx"> DOMString mediaUIImageData(MediaUIPartID partID);
</span><ins>+
+ DOMString generateUUID();
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (181881 => 181882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-03-23 23:42:40 UTC (rev 181881)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-03-24 00:44:22 UTC (rev 181882)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> Controller.PauseAfterSeeking = 1;
</span><span class="cx">
</span><span class="cx"> /* Globals */
</span><del>-Controller.gLastTimelineId = 0;
</del><span class="cx"> Controller.gWirelessImage = 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 245"><g fill="#1060FE"><path d="M193.6,6.3v121.6H6.4V6.3H193.6 M199.1,0.7H0.9v132.7h198.2V0.7L199.1,0.7z"/><path d="M43.5,139.3c15.8,8,35.3,12.7,56.5,12.7s40.7-4.7,56.5-12.7H43.5z"/></g><g text-anchor="middle" font-family="Helvetica Neue"><text x="100" y="204" fill="white" font-size="24">##DEVICE_TYPE##</text><text x="100" y="234" fill="#5C5C5C" font-size="21">##DEVICE_NAME##</text></g></svg>';
</span><span class="cx"> Controller.gSimulateWirelessPlaybackTarget = false; // Used for testing when there are no wireless targets.
</span><span class="cx"> Controller.gSimulateOptimizedFullscreenAvailable = false; // Used for testing when optimized fullscreen is not available.
</span><span class="lines">@@ -362,7 +361,7 @@
</span><span class="cx"> this.listenFor(timeline, 'mouseup', this.handleTimelineMouseUp);
</span><span class="cx"> timeline.step = .01;
</span><span class="cx">
</span><del>- this.timelineContextName = "_webkit-media-controls-timeline-" + Controller.gLastTimelineId;
</del><ins>+ this.timelineContextName = "_webkit-media-controls-timeline-" + this.host.generateUUID();
</ins><span class="cx"> timeline.style.backgroundImage = '-webkit-canvas(' + this.timelineContextName + ')';
</span><span class="cx">
</span><span class="cx"> var thumbnailTrack = this.controls.thumbnailTrack = document.createElement('div');
</span><span class="lines">@@ -410,9 +409,8 @@
</span><span class="cx"> volume.step = .01;
</span><span class="cx"> this.listenFor(volume, 'input', this.handleVolumeSliderInput);
</span><span class="cx">
</span><del>- this.volumeContextName = "_webkit-media-controls-volume-" + Controller.gLastTimelineId;
</del><ins>+ this.volumeContextName = "_webkit-media-controls-volume-" + this.host.generateUUID();
</ins><span class="cx"> volume.style.backgroundImage = '-webkit-canvas(' + this.volumeContextName + ')';
</span><del>- Controller.gLastTimelineId++;
</del><span class="cx">
</span><span class="cx"> var captionButton = this.controls.captionButton = document.createElement('button');
</span><span class="cx"> captionButton.setAttribute('pseudo', '-webkit-media-controls-toggle-closed-captions-button');
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (181881 => 181882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-03-23 23:42:40 UTC (rev 181881)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-03-24 00:44:22 UTC (rev 181882)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> this.doingSetup = true;
</span><span class="cx"> this._pageScaleFactor = 1;
</span><span class="cx">
</span><del>- this.timelineContextName = "_webkit-media-controls-timeline-" + ControllerIOS.gLastTimelineId++;
</del><ins>+ this.timelineContextName = "_webkit-media-controls-timeline-" + host.generateUUID();
</ins><span class="cx">
</span><span class="cx"> Controller.call(this, root, video, host);
</span><span class="cx">
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> /* Enums */
</span><span class="cx"> ControllerIOS.StartPlaybackControls = 2;
</span><span class="cx">
</span><del>-/* Globals */
-ControllerIOS.gLastTimelineId = 0;
</del><span class="cx">
</span><span class="cx"> ControllerIOS.prototype = {
</span><span class="cx"> addVideoListeners: function() {
</span></span></pre>
</div>
</div>
</body>
</html>