Title: [172042] branches/safari-600.1-branch/Source/WebCore
Revision
172042
Author
lforsch...@apple.com
Date
2014-08-05 12:15:21 -0700 (Tue, 05 Aug 2014)

Log Message

Merged r171259.  <rdar://problem/17718984>

Modified Paths

Diff

Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172041 => 172042)


--- branches/safari-600.1-branch/Source/WebCore/ChangeLog	2014-08-05 19:13:08 UTC (rev 172041)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog	2014-08-05 19:15:21 UTC (rev 172042)
@@ -1,3 +1,17 @@
+2014-08-05  Lucas Forschler  <lforsch...@apple.com>
+
+        Merge r171259
+
+    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-30  Lucas Forschler  <lforsch...@apple.com>
 
         Merge r171802

Modified: branches/safari-600.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (172041 => 172042)


--- branches/safari-600.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2014-08-05 19:13:08 UTC (rev 172041)
+++ branches/safari-600.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2014-08-05 19:15:21 UTC (rev 172042)
@@ -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

Reply via email to