Title: [237654] trunk/Source/WebCore
- Revision
- 237654
- Author
- jer.no...@apple.com
- Date
- 2018-10-31 14:51:20 -0700 (Wed, 31 Oct 2018)
Log Message
Unreivewed build fix; fix the non-HAVE_AVCONTENTKEYSESSION builds by adding guards around
access of m_cdmInstance.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::attemptToDecryptWithInstance):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (237653 => 237654)
--- trunk/Source/WebCore/ChangeLog 2018-10-31 21:48:01 UTC (rev 237653)
+++ trunk/Source/WebCore/ChangeLog 2018-10-31 21:51:20 UTC (rev 237654)
@@ -1,3 +1,11 @@
+2018-10-31 Jer Noble <jer.no...@apple.com>
+
+ Unreivewed build fix; fix the non-HAVE_AVCONTENTKEYSESSION builds by adding guards around
+ access of m_cdmInstance.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::attemptToDecryptWithInstance):
+
2018-10-31 YUHAN WU <yuhan...@apple.com>
MediaRecorder should fire dataavailable event when all tracks are ended and stop() is called
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (237653 => 237654)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-10-31 21:48:01 UTC (rev 237653)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-10-31 21:51:20 UTC (rev 237654)
@@ -2487,6 +2487,7 @@
void MediaPlayerPrivateAVFoundationObjC::attemptToDecryptWithInstance(CDMInstance&)
{
+#if HAVE(AVCONTENTKEYSESSION)
if (!m_keyID || !m_cdmInstance)
return;
@@ -2503,6 +2504,7 @@
[request finishLoading];
}
setWaitingForKey(false);
+#endif
}
void MediaPlayerPrivateAVFoundationObjC::setWaitingForKey(bool waitingForKey)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
