Title: [174709] trunk/Source/WebCore
- Revision
- 174709
- Author
- [email protected]
- Date
- 2014-10-14 16:31:43 -0700 (Tue, 14 Oct 2014)
Log Message
[Win] Unreviewed build fix after r174698
* platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
* platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h:
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::MediaPlayerPrivateAVFoundationCF::createSession):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (174708 => 174709)
--- trunk/Source/WebCore/ChangeLog 2014-10-14 23:23:00 UTC (rev 174708)
+++ trunk/Source/WebCore/ChangeLog 2014-10-14 23:31:43 UTC (rev 174709)
@@ -1,3 +1,12 @@
+2014-10-14 Brent Fulgham <[email protected]>
+
+ [Win] Unreviewed build fix after r174698
+
+ * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
+ * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h:
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundationCF::createSession):
+
2014-10-14 Myles C. Maxfield <[email protected]>
Improve debug description of WAKViews
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp (174708 => 174709)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp 2014-10-14 23:23:00 UTC (rev 174708)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp 2014-10-14 23:31:43 UTC (rev 174709)
@@ -26,7 +26,7 @@
#include "config.h"
#include "CDMSessionAVFoundationCF.h"
-#if ENABLE(ENCRYPTED_MEDIA_V2) && HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
+#if ENABLE(ENCRYPTED_MEDIA_V2) && HAVE(AVFOUNDATION_LOADER_DELEGATE)
#include "CDM.h"
#include "CDMSession.h"
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h (174708 => 174709)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h 2014-10-14 23:23:00 UTC (rev 174708)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h 2014-10-14 23:31:43 UTC (rev 174709)
@@ -30,7 +30,7 @@
#include <wtf/PassOwnPtr.h>
#include <wtf/RetainPtr.h>
-#if ENABLE(ENCRYPTED_MEDIA_V2) && HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
+#if ENABLE(ENCRYPTED_MEDIA_V2) && HAVE(AVFOUNDATION_LOADER_DELEGATE)
typedef struct OpaqueAVCFAssetResourceLoadingRequest* AVCFAssetResourceLoadingRequestRef;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (174708 => 174709)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-10-14 23:23:00 UTC (rev 174708)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-10-14 23:31:43 UTC (rev 174709)
@@ -1124,7 +1124,11 @@
if (!keySystemIsSupported(keySystem))
return nullptr;
+#if HAVE(AVFOUNDATION_LOADER_DELEGATE)
return std::make_unique<CDMSessionAVFoundationCF>(this);
+#else
+ return nullptr;
+#endif
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
