Title: [226922] branches/safari-605-branch/Source/WebCore
- Revision
- 226922
- Author
- [email protected]
- Date
- 2018-01-12 15:56:24 -0800 (Fri, 12 Jan 2018)
Log Message
Cherry-pick r226905. rdar://problem/36483899
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (226921 => 226922)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-12 23:56:20 UTC (rev 226921)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-12 23:56:24 UTC (rev 226922)
@@ -1,5 +1,20 @@
2018-01-12 Jason Marcell <[email protected]>
+ Cherry-pick r226905. rdar://problem/36483899
+
+ 2018-01-12 Jer Noble <[email protected]>
+
+ Wrap CDMFairPlayStreaming and related classes in ENABLE(ENCRYPTED_MEDIA) checks
+ https://bugs.webkit.org/show_bug.cgi?id=181602
+
+ Reviewed by Maciej Stachowiak.
+
+ * platform/graphics/avfoundation/CDMFairPlayStreaming.h:
+ * platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h:
+ * platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:
+
+2018-01-12 Jason Marcell <[email protected]>
+
Cherry-pick r226745. rdar://problem/36392368
2018-01-10 Youenn Fablet <[email protected]>
Modified: branches/safari-605-branch/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.h (226921 => 226922)
--- branches/safari-605-branch/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.h 2018-01-12 23:56:20 UTC (rev 226921)
+++ branches/safari-605-branch/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.h 2018-01-12 23:56:24 UTC (rev 226922)
@@ -25,6 +25,8 @@
#pragma once
+#if ENABLE(ENCRYPTED_MEDIA)
+
#include "CDMFactory.h"
#include "CDMPrivate.h"
@@ -75,3 +77,5 @@
};
}
+
+#endif // ENABLE(ENCRYPTED_MEDIA)
Modified: branches/safari-605-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h (226921 => 226922)
--- branches/safari-605-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h 2018-01-12 23:56:20 UTC (rev 226921)
+++ branches/safari-605-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h 2018-01-12 23:56:24 UTC (rev 226922)
@@ -25,7 +25,7 @@
#pragma once
-#if HAVE(AVCONTENTKEYSESSION)
+#if ENABLE(ENCRYPTED_MEDIA) && HAVE(AVCONTENTKEYSESSION)
#include "CDMInstance.h"
#include <wtf/Function.h>
@@ -102,4 +102,4 @@
SPECIALIZE_TYPE_TRAITS_CDM_INSTANCE(WebCore::CDMInstanceFairPlayStreamingAVFObjC, WebCore::CDMInstance::ImplementationType::FairPlayStreaming)
-#endif // HAVE(AVCONTENTKEYSESSION)
+#endif // ENABLE(ENCRYPTED_MEDIA) && HAVE(AVCONTENTKEYSESSION)
Modified: branches/safari-605-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm (226921 => 226922)
--- branches/safari-605-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm 2018-01-12 23:56:20 UTC (rev 226921)
+++ branches/safari-605-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm 2018-01-12 23:56:24 UTC (rev 226922)
@@ -26,7 +26,7 @@
#import "config.h"
#import "CDMInstanceFairPlayStreamingAVFObjC.h"
-#if HAVE(AVCONTENTKEYSESSION)
+#if ENABLE(ENCRYPTED_MEDIA) && HAVE(AVCONTENTKEYSESSION)
#import "CDMFairPlayStreaming.h"
#import "CDMKeySystemConfiguration.h"
@@ -484,4 +484,4 @@
}
-#endif
+#endif // ENABLE(ENCRYPTED_MEDIA) && HAVE(AVCONTENTKEYSESSION)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
