Title: [179617] branches/safari-600.1.4.15-branch/Source/WebCore
- Revision
- 179617
- Author
- [email protected]
- Date
- 2015-02-04 11:03:02 -0800 (Wed, 04 Feb 2015)
Log Message
Merged r178969. rdar://problem/19701455
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179616 => 179617)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-04 18:38:57 UTC (rev 179616)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-04 19:03:02 UTC (rev 179617)
@@ -1,5 +1,23 @@
2015-02-04 Babak Shafiei <[email protected]>
+ Merge r178969.
+
+ 2015-01-22 Jer Noble <[email protected]>
+
+ [iOS] Media controls disappear when loading a HLS live stream
+ https://bugs.webkit.org/show_bug.cgi?id=140792
+ rdar://problem/19491658
+
+ Reviewed by Dean Jackson.
+
+ Overload reconnectControls to reconnect the "start playback" button
+ if the control type has been set to "StartPlaybackButton".
+
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.reconnectControls):
+
+2015-02-04 Babak Shafiei <[email protected]>
+
Merge r172257.
2014-08-07 Eric Carlson <[email protected]>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (179616 => 179617)
--- branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-02-04 18:38:57 UTC (rev 179616)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-02-04 19:03:02 UTC (rev 179617)
@@ -193,6 +193,14 @@
this.controls.startPlaybackButton.parentNode.removeChild(this.controls.startPlaybackButton);
},
+ reconnectControls: function()
+ {
+ Controller.prototype.reconnectControls.call(this);
+
+ if (this.controlsType === ControllerIOS.StartPlaybackControls)
+ this.addStartPlaybackControls();
+ },
+
configureInlineControls: function() {
this.base.appendChild(this.controls.wirelessPlaybackStatus);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
