Title: [184570] branches/safari-601.1.32.2-branch/Source/WebCore
Revision
184570
Author
[email protected]
Date
2015-05-19 09:46:36 -0700 (Tue, 19 May 2015)

Log Message

Merge r184433. rdar://problem/20877518

Modified Paths

Diff

Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184569 => 184570)


--- branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog	2015-05-19 16:46:33 UTC (rev 184569)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog	2015-05-19 16:46:36 UTC (rev 184570)
@@ -1,5 +1,22 @@
 2015-05-18  Matthew Hanson  <[email protected]>
 
+        Merge r184433. rdar://problem/20877518
+
+    2015-05-16  Jon Lee  <[email protected]>
+
+            [iOS] wireless playback picker button is drawn incorrectly
+            https://bugs.webkit.org/show_bug.cgi?id=145057
+            rdar://problem/20877518
+
+            Reviewed by Jer Noble.
+
+            * Modules/mediacontrols/mediaControlsiOS.js:
+            (ControllerIOS.prototype.updateWirelessTargetPickerButton): This method is
+            defined in Controller, but is only meant to run on Macs. Override it with
+            an empty function for iOS.
+
+2015-05-18  Matthew Hanson  <[email protected]>
+
         Merge custom patch. rdar://problem/20950052
 
     2015-05-15  Dean Jackson  <[email protected]>

Modified: branches/safari-601.1.32.2-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (184569 => 184570)


--- branches/safari-601.1.32.2-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js	2015-05-19 16:46:33 UTC (rev 184569)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js	2015-05-19 16:46:36 UTC (rev 184570)
@@ -550,6 +550,9 @@
         Controller.prototype.updateShouldListenForPlaybackTargetAvailabilityEvent.call(this);
     },
 
+    updateWirelessTargetPickerButton: function() {
+    },
+
     updateStatusDisplay: function(event)
     {
         this.controls.startPlaybackButton.classList.toggle(this.ClassNames.failed, this.video.error !== null);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to