Fix rendering of WKRemoteView layers in the simulator
authorjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Apr 2018 21:17:37 +0000 (21:17 +0000)
committerjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Apr 2018 21:17:37 +0000 (21:17 +0000)
https://bugs.webkit.org/show_bug.cgi?id=184752

Reviewed by Tim Horton.

* Platform/mac/LayerHostingContext.mm:
(WebKit::LayerHostingContext::createForExternalHostingProcess):

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

Source/WebKit/ChangeLog
Source/WebKit/Platform/mac/LayerHostingContext.mm

index 3209a44..8497a89 100644 (file)
@@ -1,5 +1,15 @@
 2018-04-18  Jer Noble  <jer.noble@apple.com>
 
+        Fix rendering of WKRemoteView layers in the simulator
+        https://bugs.webkit.org/show_bug.cgi?id=184752
+
+        Reviewed by Tim Horton.
+
+        * Platform/mac/LayerHostingContext.mm:
+        (WebKit::LayerHostingContext::createForExternalHostingProcess):
+
+2018-04-18  Jer Noble  <jer.noble@apple.com>
+
         Fix entitlements and sandboxing for iphoneminimalsimulator
         https://bugs.webkit.org/show_bug.cgi?id=184692
 
index 8508aaf..880c6cc 100644 (file)
@@ -55,7 +55,7 @@ std::unique_ptr<LayerHostingContext> LayerHostingContext::createForExternalHosti
     auto layerHostingContext = std::make_unique<LayerHostingContext>();
     layerHostingContext->m_layerHostingMode = LayerHostingMode::OutOfProcess;
 
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && !ENABLE(MINIMAL_SIMULATOR)
     // Use a very large display ID to ensure that the context is never put on-screen 
     // without being explicitly parented. See <rdar://problem/16089267> for details.
     layerHostingContext->m_context = [CAContext remoteContextWithOptions:@{
@@ -64,7 +64,7 @@ std::unique_ptr<LayerHostingContext> LayerHostingContext::createForExternalHosti
         kCAContextDisplayId : @10000
 #endif
     }];
-#elif __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+#elif !ENABLE(MINIMAL_SIMULATOR) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     [CAContext setAllowsCGSConnections:NO];
     layerHostingContext->m_context = [CAContext remoteContextWithOptions:@{kCAContextCIFilterBehavior :  @"ignore"}];
 #else