Changeset 181882 in webkit

Timestamp:

Mar 23, 2015, 5:44:22 PM (10 years ago)

Author:

dino@apple.com

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediacontrols/MediaControlsHost.cpp (modified) (2 diffs)
• Modules/mediacontrols/MediaControlsHost.h (modified) (1 diff)
• Modules/mediacontrols/MediaControlsHost.idl (modified) (1 diff)
• Modules/mediacontrols/mediaControlsApple.js (modified) (3 diffs)
• Modules/mediacontrols/mediaControlsiOS.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2015-03-23  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp

@@ -39 +39 @@
 #include "TextTrack.h"
 #include "TextTrackList.h"
+#include "UUID.h"
 #include <runtime/JSCJSValueInlines.h>
 
@@ -293 +294 @@
 }
 
-}
-
-#endif
+String MediaControlsHost::generateUUID() const
+{
+    return createCanonicalUUIDString();
+}
+
+}
+
+#endif

trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h

@@ -81 +81 @@
     void setControlsDependOnPageScaleFactor(bool v);
 
+    String generateUUID() const;
+
 private:
     MediaControlsHost(HTMLMediaElement*);

trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl

@@ -63 +63 @@
     void enterFullscreenOptimized();
     DOMString mediaUIImageData(MediaUIPartID partID);
+
+    DOMString generateUUID();
 };

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js

@@ -46 +46 @@
 
 /* Globals */
-Controller.gLastTimelineId = 0;
 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>';
 Controller.gSimulateWirelessPlaybackTarget = false; // Used for testing when there are no wireless targets.
@@ -363 +362 @@
         timeline.step = .01;
 
-        this.timelineContextName = "_webkit-media-controls-timeline-" + Controller.gLastTimelineId;
+        this.timelineContextName = "_webkit-media-controls-timeline-" + this.host.generateUUID();
         timeline.style.backgroundImage = '-webkit-canvas(' + this.timelineContextName + ')';
         
@@ -411 +410 @@
         this.listenFor(volume, 'input', this.handleVolumeSliderInput);
 
-        this.volumeContextName = "_webkit-media-controls-volume-" + Controller.gLastTimelineId;
+        this.volumeContextName = "_webkit-media-controls-volume-" + this.host.generateUUID();
         volume.style.backgroundImage = '-webkit-canvas(' + this.volumeContextName + ')';
-        Controller.gLastTimelineId++;
         
         var captionButton = this.controls.captionButton = document.createElement('button');

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js

@@ -9 +9 @@
     this._pageScaleFactor = 1;
 
-    this.timelineContextName = "_webkit-media-controls-timeline-" + ControllerIOS.gLastTimelineId++;
+    this.timelineContextName = "_webkit-media-controls-timeline-" + host.generateUUID();
 
     Controller.call(this, root, video, host);
@@ -30 +30 @@
 ControllerIOS.StartPlaybackControls = 2;
 
-/* Globals */
-ControllerIOS.gLastTimelineId = 0;
 
 ControllerIOS.prototype = {