Changeset 82997 in webkit

Timestamp:

Apr 5, 2011 4:03:33 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-04-05 Anders Carlsson <​andersca@apple.com>

Reviewed by Alexey Proskuryakov.

Some plug-in content is displayed upside down in Unity plug-in
​https://bugs.webkit.org/show_bug.cgi?id=57895
<rdar://problem/9212003>

Create the flipped geometry layer in the web process instead of the plug-in process,
which matches what we do in WebKit1.

• WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm: (WebKit::NetscapePlugin::platformPostInitialize):
• WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm: (WebKit::PluginProxy::pluginLayer):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (modified) (1 diff)
• WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-05  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Some plug-in content is displayed upside down in Unity plug-in
+        https://bugs.webkit.org/show_bug.cgi?id=57895
+        <rdar://problem/9212003>
+
+        Create the flipped geometry layer in the web process instead of the plug-in process,
+        which matches what we do in WebKit1.
+
+        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+        (WebKit::NetscapePlugin::platformPostInitialize):
+        * WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm:
+        (WebKit::PluginProxy::pluginLayer):
+
 2011-04-05  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm

@@ -233 +233 @@
         if (NPP_GetValue(NPPVpluginCoreAnimationLayer, &value) == NPERR_NO_ERROR && value) {
             ASSERT(!m_pluginLayer);
-
-            CALayer *realPluginLayer = reinterpret_cast<CALayer *>(value);
-
-            // Create a layer with flipped geometry and add the real plug-in layer as a sublayer
-            // so the coordinate system will match the event coordinate system.
-            m_pluginLayer.adoptNS([[CALayer alloc] init]);
-            [m_pluginLayer.get() setBounds:[realPluginLayer bounds]];
-            [m_pluginLayer.get() setGeometryFlipped:YES];
-
-            [realPluginLayer setAutoresizingMask:kCALayerWidthSizable | kCALayerHeightSizable];
-            [m_pluginLayer.get() addSublayer:realPluginLayer];
+            m_pluginLayer = reinterpret_cast<CALayer *>(value);
         }
     }

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm

@@ -35 +35 @@
 PlatformLayer* PluginProxy::pluginLayer()
 {
-    if (!m_pluginLayer && m_remoteLayerClientID)
-        m_pluginLayer = WKMakeRenderLayer(m_remoteLayerClientID);
+    if (!m_pluginLayer && m_remoteLayerClientID) {
+        CALayer *renderLayer = WKMakeRenderLayer(m_remoteLayerClientID);
+
+        // Create a layer with flipped geometry and add the real plug-in layer as a sublayer
+        // so the coordinate system will match the event coordinate system.
+        m_pluginLayer.adoptNS([[CALayer alloc] init]);
+        [m_pluginLayer.get() setGeometryFlipped:YES];
+        
+        [renderLayer setAutoresizingMask:kCALayerWidthSizable | kCALayerHeightSizable];
+        [m_pluginLayer.get() addSublayer:renderLayer];
+    }
 
     return m_pluginLayer.get();