Title: [171933] tags/Safari-600.1.4.3/Source/WebCore
- Revision
- 171933
- Author
- [email protected]
- Date
- 2014-08-01 11:32:18 -0700 (Fri, 01 Aug 2014)
Log Message
Merge r171259. <rdar://problem/17718984>
Modified Paths
Diff
Modified: tags/Safari-600.1.4.3/Source/WebCore/ChangeLog (171932 => 171933)
--- tags/Safari-600.1.4.3/Source/WebCore/ChangeLog 2014-08-01 18:30:34 UTC (rev 171932)
+++ tags/Safari-600.1.4.3/Source/WebCore/ChangeLog 2014-08-01 18:32:18 UTC (rev 171933)
@@ -1,5 +1,19 @@
2014-07-31 Matthew Hanson <[email protected]>
+ Merge r171259. <rdar://problem/17718984>
+
+ 2014-07-18 Eric Carlson <[email protected]>
+
+ [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 <[email protected]>
+
Merge r171895. <rdar://problem/17835345>
2014-07-31 Jer Noble <[email protected]>
Modified: tags/Safari-600.1.4.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (171932 => 171933)
--- tags/Safari-600.1.4.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-08-01 18:30:34 UTC (rev 171932)
+++ tags/Safari-600.1.4.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-08-01 18:32:18 UTC (rev 171933)
@@ -1155,6 +1155,10 @@
void MediaPlayerPrivateAVFoundationObjC::setVolume(float volume)
{
+#if PLATFORM(IOS)
+ return;
+#endif
+
if (!metaDataAvailable())
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
