Title: [171927] branches/safari-600.1.4-branch/Source/WebCore
- Revision
- 171927
- Author
- matthew_han...@apple.com
- Date
- 2014-08-01 11:21:59 -0700 (Fri, 01 Aug 2014)
Log Message
Merge r171259. <rdar://problem/17718984>
Modified Paths
Diff
Modified: branches/safari-600.1.4-branch/Source/WebCore/ChangeLog (171926 => 171927)
--- branches/safari-600.1.4-branch/Source/WebCore/ChangeLog 2014-08-01 18:21:11 UTC (rev 171926)
+++ branches/safari-600.1.4-branch/Source/WebCore/ChangeLog 2014-08-01 18:21:59 UTC (rev 171927)
@@ -1,5 +1,19 @@
2014-07-31 Matthew Hanson <matthew_han...@apple.com>
+ Merge r171259. <rdar://problem/17718984>
+
+ 2014-07-18 Eric Carlson <eric.carl...@apple.com>
+
+ [iOS] ignore requests to set volume
+ https://bugs.webkit.org/show_bug.cgi?id=135081
+
+ Reviewed by Jer Noble.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setVolume): Do nothing on iOS.
+
+2014-07-31 Matthew Hanson <matthew_han...@apple.com>
+
Merge r171895. <rdar://problem/17835345>
2014-07-31 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-600.1.4-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (171926 => 171927)
--- branches/safari-600.1.4-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-08-01 18:21:11 UTC (rev 171926)
+++ branches/safari-600.1.4-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-08-01 18:21:59 UTC (rev 171927)
@@ -1155,6 +1155,10 @@
void MediaPlayerPrivateAVFoundationObjC::setVolume(float volume)
{
+#if PLATFORM(IOS)
+ return;
+#endif
+
if (!metaDataAvailable())
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
