Title: [255005] branches/safari-609-branch/Source/WebCore
- Revision
- 255005
- Author
- [email protected]
- Date
- 2020-01-23 13:43:18 -0800 (Thu, 23 Jan 2020)
Log Message
Cherry-pick r254490. rdar://problem/58605943
[WK1][iOS] VideoFullscreenControllerContext uses UIKit on the WebThread
https://bugs.webkit.org/show_bug.cgi?id=206203
<rdar://problem/48742782>
Reviewed by Simon Fraser.
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
(VideoFullscreenControllerContext::setVideoLayerFrame):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254490 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebCore/ChangeLog (255004 => 255005)
--- branches/safari-609-branch/Source/WebCore/ChangeLog 2020-01-23 21:43:15 UTC (rev 255004)
+++ branches/safari-609-branch/Source/WebCore/ChangeLog 2020-01-23 21:43:18 UTC (rev 255005)
@@ -1,5 +1,32 @@
2020-01-23 Russell Epstein <[email protected]>
+ Cherry-pick r254490. rdar://problem/58605943
+
+ [WK1][iOS] VideoFullscreenControllerContext uses UIKit on the WebThread
+ https://bugs.webkit.org/show_bug.cgi?id=206203
+ <rdar://problem/48742782>
+
+ Reviewed by Simon Fraser.
+
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (VideoFullscreenControllerContext::setVideoLayerFrame):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254490 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-13 Jer Noble <[email protected]>
+
+ [WK1][iOS] VideoFullscreenControllerContext uses UIKit on the WebThread
+ https://bugs.webkit.org/show_bug.cgi?id=206203
+ <rdar://problem/48742782>
+
+ Reviewed by Simon Fraser.
+
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (VideoFullscreenControllerContext::setVideoLayerFrame):
+
+2020-01-23 Russell Epstein <[email protected]>
+
Cherry-pick r254484. rdar://problem/58606285
RenderTreeBuilder::Block::attachIgnoringContinuation should handle inline-block anonymous containers.
Modified: branches/safari-609-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (255004 => 255005)
--- branches/safari-609-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2020-01-23 21:43:15 UTC (rev 255004)
+++ branches/safari-609-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2020-01-23 21:43:18 UTC (rev 255005)
@@ -589,18 +589,16 @@
RetainPtr<CALayer> videoFullscreenLayer = [m_videoFullscreenView layer];
[videoFullscreenLayer setSublayerTransform:[videoFullscreenLayer transform]];
- dispatch_async(dispatch_get_main_queue(), [protectedThis = makeRefPtr(this), this, frame, videoFullscreenLayer = WTFMove(videoFullscreenLayer)] () mutable {
- WebThreadRun([protectedThis = WTFMove(protectedThis), this, frame, videoFullscreenLayer = WTFMove(videoFullscreenLayer)] {
- [CATransaction begin];
- [CATransaction setDisableActions:YES];
- [CATransaction setAnimationDuration:0];
-
- [videoFullscreenLayer setSublayerTransform:CATransform3DIdentity];
-
- if (m_fullscreenModel)
- m_fullscreenModel->setVideoLayerFrame(frame);
- [CATransaction commit];
- });
+ dispatchAsyncOnMainThreadWithWebThreadLockIfNeeded([protectedThis = makeRefPtr(this), this, frame, videoFullscreenLayer = WTFMove(videoFullscreenLayer)] {
+ [CATransaction begin];
+ [CATransaction setDisableActions:YES];
+ [CATransaction setAnimationDuration:0];
+
+ [videoFullscreenLayer setSublayerTransform:CATransform3DIdentity];
+
+ if (m_fullscreenModel)
+ m_fullscreenModel->setVideoLayerFrame(frame);
+ [CATransaction commit];
});
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
