Title: [119040] branches/safari-536-branch/Source/WebCore
- Revision
- 119040
- Author
- [email protected]
- Date
- 2012-05-30 20:27:48 -0700 (Wed, 30 May 2012)
Log Message
Merged r118450 -> <rdar://problem/11503078>
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (119039 => 119040)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-31 03:26:15 UTC (rev 119039)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-31 03:27:48 UTC (rev 119040)
@@ -1,5 +1,23 @@
2012-05-30 Lucas Forschler <[email protected]>
+ Merge 118450
+
+ 2012-05-24 Anders Carlsson <[email protected]>
+
+ Corrupted pages rendering when images are zoomed on Google+
+ https://bugs.webkit.org/show_bug.cgi?id=87439
+ <rdar://problem/11503078>
+
+ Reviewed by Beth Dakin.
+
+ The rect that's given to scrollContentsSlowPath is in frame view coordinates, but if we end up
+ passing them to RenderLayer::setBackingNeedsRepaintInRect we need to account for the frame scale factor.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scrollContentsSlowPath):
+
+2012-05-30 Lucas Forschler <[email protected]>
+
Merge 118411
2012-05-24 Jer Noble <[email protected]>
Modified: branches/safari-536-branch/Source/WebCore/page/FrameView.cpp (119039 => 119040)
--- branches/safari-536-branch/Source/WebCore/page/FrameView.cpp 2012-05-31 03:26:15 UTC (rev 119039)
+++ branches/safari-536-branch/Source/WebCore/page/FrameView.cpp 2012-05-31 03:27:48 UTC (rev 119040)
@@ -1532,7 +1532,14 @@
if (contentsInCompositedLayer()) {
RenderView* root = rootRenderer(this);
ASSERT(root);
- root->layer()->setBackingNeedsRepaintInRect(visibleContentRect());
+
+ IntRect updateRect = visibleContentRect();
+
+ // Make sure to "apply" the scale factor here since we're converting from frame view
+ // coordinates to layer backing coordinates.
+ updateRect.scale(1 / m_frame->frameScaleFactor());
+
+ root->layer()->setBackingNeedsRepaintInRect(updateRect);
}
if (RenderPart* frameRenderer = m_frame->ownerRenderer()) {
if (isEnclosedInCompositingLayer()) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
