Title: [172043] branches/safari-600.1-branch/Source/WebCore
- Revision
- 172043
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 12:16:57 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r171279. <rdar://problem/17718984>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172042 => 172043)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 19:15:21 UTC (rev 172042)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 19:16:57 UTC (rev 172043)
@@ -1,5 +1,20 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r171279
+
+ 2014-07-20 Eric Carlson <eric.carl...@apple.com>
+
+ [iOS] ignore requests to set volume
+ https://bugs.webkit.org/show_bug.cgi?id=135081
+
+ Applied post-review comments from Darin Adler.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setVolume): Don't include unreachable
+ code on iOS.
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r171259
2014-07-18 Eric Carlson <eric.carl...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (172042 => 172043)
--- branches/safari-600.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-08-05 19:15:21 UTC (rev 172042)
+++ branches/safari-600.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-08-05 19:16:57 UTC (rev 172043)
@@ -1156,13 +1156,14 @@
void MediaPlayerPrivateAVFoundationObjC::setVolume(float volume)
{
#if PLATFORM(IOS)
+ UNUSED_PARAM(volume);
return;
-#endif
-
+#else
if (!metaDataAvailable())
return;
[m_avPlayer.get() setVolume:volume];
+#endif
}
void MediaPlayerPrivateAVFoundationObjC::setClosedCaptionsVisible(bool closedCaptionsVisible)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
