Unreviewed watchOS build fix; Fix declaration for ports which USE(ENCRYPTED_MEDIA...
authorjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Sep 2018 22:37:01 +0000 (22:37 +0000)
committerjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Sep 2018 22:37:01 +0000 (22:37 +0000)
HAVE(AVCONTENTKEYSESSION).

* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236577 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h

index c5c73a7..a8d1f2c 100644 (file)
@@ -1,3 +1,10 @@
+2018-09-27  Jer Noble  <jer.noble@apple.com>
+
+        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  <justin_michaud@apple.com>
 
         Remove duplicate CSS Properties and Values feature on status page
index 2927aca..a2503e6 100644 (file)
@@ -393,10 +393,12 @@ private:
 #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;