Title: [178561] branches/safari-600.5-branch/Source/WebCore
- Revision
- 178561
- Author
- matthew_han...@apple.com
- Date
- 2015-01-15 17:58:36 -0800 (Thu, 15 Jan 2015)
Log Message
Merged r174713. rdar://problem/19451946
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (178560 => 178561)
--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-16 01:58:33 UTC (rev 178560)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-16 01:58:36 UTC (rev 178561)
@@ -1,5 +1,16 @@
2015-01-15 Matthew Hanson <matthew_han...@apple.com>
+ Merge r174713. rdar://problem/19451946
+
+ 2014-10-14 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Unreviewed build fix after r174710.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundationCF::createSession):
+
+2015-01-15 Matthew Hanson <matthew_han...@apple.com>
+
Merge r174710. rdar://problem/19451946
2014-10-14 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (178560 => 178561)
--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-01-16 01:58:33 UTC (rev 178560)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-01-16 01:58:36 UTC (rev 178561)
@@ -1123,11 +1123,12 @@
if (!keySystemIsSupported(keySystem))
return nullptr;
-#if HAVE(AVFOUNDATION_LOADER_DELEGATE)
return std::make_unique<CDMSessionAVFoundationCF>(this);
-#else
+}
+#elif ENABLE(ENCRYPTED_MEDIA_V2)
+std::unique_ptr<CDMSession> MediaPlayerPrivateAVFoundationCF::createSession(const String& keySystem)
+{
return nullptr;
-#endif
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
