Title: [171929] branches/safari-600.1.4-branch/Source/WebCore
- Revision
- 171929
- Author
- [email protected]
- Date
- 2014-08-01 11:26:16 -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 (171928 => 171929)
--- branches/safari-600.1.4-branch/Source/WebCore/ChangeLog 2014-08-01 18:22:38 UTC (rev 171928)
+++ branches/safari-600.1.4-branch/Source/WebCore/ChangeLog 2014-08-01 18:26:16 UTC (rev 171929)
@@ -2,6 +2,21 @@
Merge r171259. <rdar://problem/17718984>
+ 2014-07-20 Eric Carlson <[email protected]>
+
+ [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-07-31 Matthew Hanson <[email protected]>
+
+ Merge r171259. <rdar://problem/17718984>
+
2014-07-18 Eric Carlson <[email protected]>
[iOS] ignore requests to set volume
Modified: branches/safari-600.1.4-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (171928 => 171929)
--- branches/safari-600.1.4-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-08-01 18:22:38 UTC (rev 171928)
+++ branches/safari-600.1.4-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-08-01 18:26:16 UTC (rev 171929)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
