Title: [204121] branches/safari-602-branch/Source/WebCore
- Revision
- 204121
- Author
- [email protected]
- Date
- 2016-08-04 09:10:21 -0700 (Thu, 04 Aug 2016)
Log Message
Merge r204100. rdar://problem/27310475
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (204120 => 204121)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-04 15:59:44 UTC (rev 204120)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-04 16:10:21 UTC (rev 204121)
@@ -1,3 +1,18 @@
+2016-08-04 Babak Shafiei <[email protected]>
+
+ Merge r204100. rdar://problem/27310475
+
+ 2016-08-03 Eric Carlson <[email protected]>
+
+ [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 <[email protected]>
Rollout r204068. rdar://problem/27547583
Modified: branches/safari-602-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (204120 => 204121)
--- branches/safari-602-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-08-04 15:59:44 UTC (rev 204120)
+++ branches/safari-602-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-08-04 16:10:21 UTC (rev 204121)
@@ -176,7 +176,9 @@
void platformPause() override;
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;
void paint(GraphicsContext&, const FloatRect&) override;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
