Title: [230535] tags/Safari-606.1.12.0.1/Source/WebCore
- Revision
- 230535
- Author
- bshaf...@apple.com
- Date
- 2018-04-11 10:56:49 -0700 (Wed, 11 Apr 2018)
Log Message
Cherry-pick r230265. rdar://problem/39179126
Modified Paths
Diff
Modified: tags/Safari-606.1.12.0.1/Source/WebCore/ChangeLog (230534 => 230535)
--- tags/Safari-606.1.12.0.1/Source/WebCore/ChangeLog 2018-04-11 17:39:21 UTC (rev 230534)
+++ tags/Safari-606.1.12.0.1/Source/WebCore/ChangeLog 2018-04-11 17:56:49 UTC (rev 230535)
@@ -1,3 +1,35 @@
+2018-04-11 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r230265. rdar://problem/39179126
+
+ Fix the !HAVE(AVFOUNDATION_VIDEO_OUTPUT) build
+ https://bugs.webkit.org/show_bug.cgi?id=184309
+ -and corresponding-
+ rdar://problem/39179126
+
+ Reviewed by Jer Noble.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::updateVideoFullscreenInlineImage):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer):
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230265 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-04-04 Beth Dakin <bda...@apple.com>
+
+ Fix the !HAVE(AVFOUNDATION_VIDEO_OUTPUT) build
+ https://bugs.webkit.org/show_bug.cgi?id=184309
+ -and corresponding-
+ rdar://problem/39179126
+
+ Reviewed by Jer Noble.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::updateVideoFullscreenInlineImage):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer):
+
2018-04-04 Jason Marcell <jmarc...@apple.com>
Cherry-pick r230272. rdar://problem/39007591
Modified: tags/Safari-606.1.12.0.1/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (230534 => 230535)
--- tags/Safari-606.1.12.0.1/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-04-11 17:39:21 UTC (rev 230534)
+++ tags/Safari-606.1.12.0.1/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-04-11 17:56:49 UTC (rev 230535)
@@ -1168,14 +1168,20 @@
void MediaPlayerPrivateAVFoundationObjC::updateVideoFullscreenInlineImage()
{
+#if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
updateLastImage(UpdateType::UpdateSynchronously);
m_videoFullscreenLayerManager->updateVideoFullscreenInlineImage(m_lastImage);
+#endif
}
void MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer(PlatformLayer* videoFullscreenLayer, Function<void()>&& completionHandler)
{
+#if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
updateLastImage(UpdateType::UpdateSynchronously);
m_videoFullscreenLayerManager->setVideoFullscreenLayer(videoFullscreenLayer, WTFMove(completionHandler), m_lastImage);
+#else
+ m_videoFullscreenLayerManager->setVideoFullscreenLayer(videoFullscreenLayer, WTFMove(completionHandler), nil);
+#endif
updateDisableExternalPlayback();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
