Title: [236577] trunk/Source/WebCore
- Revision
- 236577
- Author
- [email protected]
- Date
- 2018-09-27 15:37:01 -0700 (Thu, 27 Sep 2018)
Log Message
Unreviewed watchOS build fix; Fix declaration for ports which USE(ENCRYPTED_MEDIA) but don't
HAVE(AVCONTENTKEYSESSION).
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (236576 => 236577)
--- trunk/Source/WebCore/ChangeLog 2018-09-27 22:33:24 UTC (rev 236576)
+++ trunk/Source/WebCore/ChangeLog 2018-09-27 22:37:01 UTC (rev 236577)
@@ -1,3 +1,10 @@
+2018-09-27 Jer Noble <[email protected]>
+
+ Unreviewed watchOS build fix; Fix declaration for ports which USE(ENCRYPTED_MEDIA) but don't
+ HAVE(AVCONTENTKEYSESSION).
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+
2018-09-27 Justin Michaud <[email protected]>
Remove duplicate CSS Properties and Values feature on status page
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (236576 => 236577)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2018-09-27 22:33:24 UTC (rev 236576)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2018-09-27 22:37:01 UTC (rev 236577)
@@ -393,10 +393,12 @@
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
WeakPtr<CDMSessionAVFoundationObjC> m_session;
#endif
-#if ENABLE(ENCRYPTED_MEDIA) && HAVE(AVCONTENTKEYSESSION)
+#if ENABLE(ENCRYPTED_MEDIA)
bool m_waitingForKey { false };
+#if HAVE(AVCONTENTKEYSESSION)
RefPtr<CDMInstanceFairPlayStreamingAVFObjC> m_cdmInstance;
#endif
+#endif
mutable RetainPtr<NSArray> m_cachedSeekableRanges;
mutable RetainPtr<NSArray> m_cachedLoadedRanges;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
