Title: [98591] branches/safari-534.52-branch/Source/WebKit2
- Revision
- 98591
- Author
- lforsch...@apple.com
- Date
- 2011-10-27 09:36:41 -0700 (Thu, 27 Oct 2011)
Log Message
Merge 98394.
Modified Paths
Diff
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98590 => 98591)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-27 16:32:00 UTC (rev 98590)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-27 16:36:41 UTC (rev 98591)
@@ -1,5 +1,21 @@
2011-10-27 Lucas Forschler <lforsch...@apple.com>
+ Merge 98394
+
+ 2011-10-25 Anders Carlsson <ander...@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-27 Lucas Forschler <lforsch...@apple.com>
+
Merge 98369
2011-10-25 Anders Carlsson <ander...@apple.com>
Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (98590 => 98591)
--- branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2011-10-27 16:32:00 UTC (rev 98590)
+++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2011-10-27 16:36:41 UTC (rev 98591)
@@ -707,11 +707,17 @@
if (!m_isInitialized || !m_plugin || !parent())
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());
}
void PluginView::viewVisibilityDidChange()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
