Changeset 204121 in webkit

Timestamp:

Aug 4, 2016, 9:10:21 AM (10 years ago)

Author:

bshafiei@apple.com

Message:

Merge r204100. rdar://problem/27310475

Location:

branches/safari-602-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (modified) (1 diff)

branches/safari-602-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-04  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r204100. rdar://problem/27310475
+
+    2016-08-03  Eric Carlson  <eric.carlson@apple.com>
+
+            [Mac] Work around AVPlayer setMuted bug
+            https://bugs.webkit.org/show_bug.cgi?id=160519
+            <rdar://problem/27310475>
+
+            Reviewed by Dean Jackson.
+
+            * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h: Only override
+            supportsMuting on iOS.
+
 2016-08-03  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h

@@ -177 +177 @@
     MediaTime currentMediaTime() const override;
     void setVolume(float) override;
+#if PLATFORM(IOS)
     bool supportsMuting() const override { return true; }
+#endif
     void setMuted(bool) override;
     void setClosedCaptionsVisible(bool) override;