Changeset 98394 in webkit

Timestamp:

Oct 25, 2011, 2:11:00 PM (15 years ago)

Author:

andersca@apple.com

Message:

Assertion failure when zooming a PDF in an iframe
​https://bugs.webkit.org/show_bug.cgi?id=70849

Reviewed by Alexey Proskuryakov.

If the plug-in doesn't want window relative coordinates, we shouldn't give the plug-in window relative coordinates.

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::viewGeometryDidChange):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PluginView.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-10-25  Anders Carlsson  <andersca@apple.com>
+
+        Assertion failure when zooming a PDF in an iframe
+        https://bugs.webkit.org/show_bug.cgi?id=70849
+
+        Reviewed by Alexey Proskuryakov.
+
+        If the plug-in doesn't want window relative coordinates, we shouldn't give the plug-in window relative coordinates.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::viewGeometryDidChange):
+
 2011-10-25  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -709 +709 @@
         return;
 
-    // Get the frame rect in window coordinates.
-    // FIXME: Figure out what we should pass here when m_plugin->wantsWindowRelativeCoordinates() returns false.
-    IntRect frameRectInWindowCoordinates = parent()->contentsToWindow(frameRect());
-    m_plugin->geometryDidChange(frameRectInWindowCoordinates, clipRectInWindowCoordinates());
+    IntRect rect;
+
+    if (m_plugin->wantsWindowRelativeCoordinates()) {
+        // Get the frame rect in window coordinates.
+        rect = parent()->contentsToWindow(frameRect());
+    } else {
+        // FIXME: The plug-in shouldn't know its location relative to its parent frame.
+        rect = frameRect();
+    }
+
+    m_plugin->geometryDidChange(rect, clipRectInWindowCoordinates());
 }