Title: [127322] branches/safari-536.26-branch/Source/WebKit2
- Revision
- 127322
- Author
- [email protected]
- Date
- 2012-08-31 14:34:39 -0700 (Fri, 31 Aug 2012)
Log Message
Merge r127319 for <rdar://problem/12217897>.
Modified Paths
Diff
Modified: branches/safari-536.26-branch/Source/WebKit2/ChangeLog (127321 => 127322)
--- branches/safari-536.26-branch/Source/WebKit2/ChangeLog 2012-08-31 21:26:44 UTC (rev 127321)
+++ branches/safari-536.26-branch/Source/WebKit2/ChangeLog 2012-08-31 21:34:39 UTC (rev 127322)
@@ -1,5 +1,20 @@
2012-08-31 Timothy Hatcher <[email protected]>
+ Merge r127319.
+
+ 2012-08-31 Brady Eidson <[email protected]>
+
+ REGRESSION (r127252): incomplete repaint on Flash element after pinch to zoom
+ <rdar://problem/12217897> and https://bugs.webkit.org/show_bug.cgi?id=95607
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::viewGeometryDidChange): Only give the window coordinate clip rect a chance
+ to override the boundsRect() if the page scale factor is 1.
+
+2012-08-31 Timothy Hatcher <[email protected]>
+
Merge r127272.
2012-08-31 Brady Eidson <[email protected]>
Modified: branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (127321 => 127322)
--- branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2012-08-31 21:26:44 UTC (rev 127321)
+++ branches/safari-536.26-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2012-08-31 21:34:39 UTC (rev 127322)
@@ -756,13 +756,19 @@
transform.translate(scaledLocationInRootViewCoordinates.x(), scaledLocationInRootViewCoordinates.y());
transform.scale(pageScaleFactor);
- // FIXME: This clip rect isn't correct.
- // But it is still important distinguish between empty and non-empty rects so we can notify the plug-in when it becomes invisible.
+ // FIXME: The way we calculate this clip rect isn't correct.
+ // But it is still important to distinguish between empty and non-empty rects so we can notify the plug-in when it becomes invisible.
// Making the rect actually correct is covered by https://bugs.webkit.org/show_bug.cgi?id=95362
- IntRect clipRect = clipRectInWindowCoordinates();
- if (!clipRect.isEmpty())
- clipRect = boundsRect();
-
+ IntRect clipRect = boundsRect();
+
+ // FIXME: We can only get a semi-reliable answer from clipRectInWindowCoordinates() when the page is not scaled.
+ // Fixing that is tracked in <rdar://problem/9026611> - Make the Widget hierarchy play nicely with transforms, for zoomed plug-ins and iframes
+ if (pageScaleFactor == 1) {
+ clipRect = clipRectInWindowCoordinates();
+ if (!clipRect.isEmpty())
+ clipRect = boundsRect();
+ }
+
m_plugin->geometryDidChange(size(), clipRect, transform);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
