Changeset 229629 in webkit

Timestamp:

Mar 15, 2018 11:30:19 AM (6 years ago)

Author:

Brent Fulgham

Message:

REGRESSION(r229484): Plugins often require CGS Connections to draw
​https://bugs.webkit.org/show_bug.cgi?id=183663
<rdar://problem/38439218>

Reviewed by Per Arne Vollan.

Flash requires an active CGSConnection to work properly. Since we don't want the WebContent
process to have on, create a new plugin process-specific layer host creation method that
gives this access.

• Platform/mac/LayerHostingContext.h:
• Platform/mac/LayerHostingContext.mm:

(WebKit::LayerHostingContext::createForExternalPluginHostingProcess): Added.

• PluginProcess/mac/PluginControllerProxyMac.mm:

(WebKit::PluginControllerProxy::updateLayerHostingContext): Use the new creation
method.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/mac/LayerHostingContext.h (modified) (1 diff)
• Platform/mac/LayerHostingContext.mm (modified) (1 diff)
• PluginProcess/mac/PluginControllerProxyMac.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-15  Brent Fulgham  <bfulgham@apple.com>
+
+        REGRESSION(r229484): Plugins often require CGS Connections to draw
+        https://bugs.webkit.org/show_bug.cgi?id=183663
+        <rdar://problem/38439218>
+
+        Reviewed by Per Arne Vollan.
+
+        Flash requires an active CGSConnection to work properly. Since we don't want the WebContent
+        process to have on, create a new plugin process-specific layer host creation method that
+        gives this access.
+
+        * Platform/mac/LayerHostingContext.h:
+        * Platform/mac/LayerHostingContext.mm:
+        (WebKit::LayerHostingContext::createForExternalPluginHostingProcess): Added.
+        * PluginProcess/mac/PluginControllerProxyMac.mm:
+        (WebKit::PluginControllerProxy::updateLayerHostingContext): Use the new creation
+        method.
+
 2018-03-15  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit/Platform/mac/LayerHostingContext.h

@@ -47 +47 @@
 #if HAVE(OUT_OF_PROCESS_LAYER_HOSTING)
     static std::unique_ptr<LayerHostingContext> createForExternalHostingProcess();
+#if PLATFORM(MAC)
+    static std::unique_ptr<LayerHostingContext> createForExternalPluginHostingProcess();
+#endif
 #endif
 

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

@@ -73 +73 @@
     return layerHostingContext;
 }
+
+#if PLATFORM(MAC)
+std::unique_ptr<LayerHostingContext> LayerHostingContext::createForExternalPluginHostingProcess()
+{
+    auto layerHostingContext = std::make_unique<LayerHostingContext>();
+    layerHostingContext->m_layerHostingMode = LayerHostingMode::OutOfProcess;
+    layerHostingContext->m_context = [CAContext contextWithCGSConnection:CGSMainConnectionID() options:@{ kCAContextCIFilterBehavior : @"ignore" }];
+    return layerHostingContext;
+}
 #endif
+#endif // HAVE(OUT_OF_PROCESS_LAYER_HOSTING)
 
 LayerHostingContext::LayerHostingContext()

trunk/Source/WebKit/PluginProcess/mac/PluginControllerProxyMac.mm

@@ -131 +131 @@
 #if HAVE(OUT_OF_PROCESS_LAYER_HOSTING)
         case LayerHostingMode::OutOfProcess:
-            m_layerHostingContext = LayerHostingContext::createForExternalHostingProcess();
+            m_layerHostingContext = LayerHostingContext::createForExternalPluginHostingProcess();
             break;
 #endif