Title: [174713] trunk/Source/WebCore
- Revision
- 174713
- Author
- bfulg...@apple.com
- Date
- 2014-10-14 17:02:24 -0700 (Tue, 14 Oct 2014)
Log Message
[Win] Unreviewed build fix after r174710.
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::MediaPlayerPrivateAVFoundationCF::createSession):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (174712 => 174713)
--- trunk/Source/WebCore/ChangeLog 2014-10-14 23:58:34 UTC (rev 174712)
+++ trunk/Source/WebCore/ChangeLog 2014-10-15 00:02:24 UTC (rev 174713)
@@ -1,3 +1,10 @@
+2014-10-14 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Unreviewed build fix after r174710.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundationCF::createSession):
+
2014-10-14 Dan Bernstein <m...@apple.com>
URLs that start with http:/// and https:/// lose two slashes when parsed, causing assertion failure and inconsistent behavior
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (174712 => 174713)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-10-14 23:58:34 UTC (rev 174712)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-10-15 00:02:24 UTC (rev 174713)
@@ -1124,11 +1124,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
