Changeset 70499 in webkit

Timestamp:

Oct 25, 2010 3:59:14 PM (14 years ago)

Author:

andersca@apple.com

Message:

Update the fake Carbon window when the window frame changes
​https://bugs.webkit.org/show_bug.cgi?id=48273

Reviewed by Dan Bernstein.

• UIProcess/API/mac/WKView.mm:

(screenForWindow):
(-[WKView _updateWindowFrame]):
Pass the window frame in Carbon coordinates.

• WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:

(WebKit::NetscapePlugin::windowFrameChanged):
Update the window bounds.

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::setWindowFrame):
Call the plug-in.

(WebKit::PluginView::platformLayer):
Fix a crash when WebCore asked for the layer before it was initialized.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (1 diff)
• WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (modified) (1 diff)
• WebProcess/Plugins/PluginView.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-25  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Update the fake Carbon window when the window frame changes
+        https://bugs.webkit.org/show_bug.cgi?id=48273
+
+        * UIProcess/API/mac/WKView.mm:
+        (screenForWindow):
+        (-[WKView _updateWindowFrame]):
+        Pass the window frame in Carbon coordinates.
+
+        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+        (WebKit::NetscapePlugin::windowFrameChanged):
+        Update the window bounds.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::setWindowFrame):
+        Call the plug-in.
+
+        (WebKit::PluginView::platformLayer):
+        Fix a crash when WebCore asked for the layer before it was initialized.
+
 2010-10-25  Oliver Hunt  <oliver@apple.com>
 

trunk/WebKit2/UIProcess/API/mac/WKView.mm

@@ -409 +409 @@
 }
 
+static NSScreen *screenForWindow(NSWindow *window)
+{
+    if (NSScreen *screen = [window screen]) // nil if the window is off-screen
+        return screen;
+    
+    NSArray *screens = [NSScreen screens];
+    if ([screens count] > 0)
+        return [screens objectAtIndex:0]; // screen containing the menubar
+    
+    return nil;
+}
+
 - (void)_updateWindowFrame
 {
-    ASSERT([self window]);
-
-    _data->_page->updateWindowFrame(enclosingIntRect([[self window] frame]));
+    NSWindow *window = [self window];
+    ASSERT(window);
+
+    // We want the window frame in Carbon coordinates, so flip the Y coordinate.
+    NSRect windowFrame = [window frame];
+    NSScreen *screen = ::screenForWindow(window);
+    windowFrame.origin.y = NSMaxY([screen frame]) - windowFrame.origin.y;
+
+    _data->_page->updateWindowFrame(enclosingIntRect(windowFrame));
 }
 

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

@@ -603 +603 @@
 }
 
-void NetscapePlugin::windowFrameChanged(const IntRect&)
-{
-    // FIXME: Implement.
+void NetscapePlugin::windowFrameChanged(const IntRect& windowFrame)
+{
+    switch (m_eventModel) {
+        case NPEventModelCocoa:
+            // Nothing to do.
+            break;
+
+        case NPEventModelCarbon: {
+            Rect bounds;
+            bounds.top = windowFrame.y() + windowFrame.height();
+            bounds.left = windowFrame.x();
+            bounds.right = windowFrame.right();
+            bounds.bottom = windowFrame.y();
+            
+            ::SetWindowBounds(windowRef(), kWindowStructureRgn, &bounds);
+            break;
+        }
+
+        default:
+            ASSERT_NOT_REACHED();
+    }
 }
     

trunk/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -340 +340 @@
     if (!m_plugin)
         return;
-        
-    // FIXME: Implement.
+
+    m_plugin->windowFrameChanged(windowFrame);
 }
 
@@ -399 +399 @@
 PlatformLayer* PluginView::platformLayer() const
 {
+    // The plug-in can be null here if it failed to initialize or hasn't yet been initialized.
+    if (!m_plugin)
+        return 0;
+        
     return m_plugin->pluginLayer();
 }