Title: [118222] branches/safari-536-branch/Source/WebKit2
Diff
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (118221 => 118222)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-23 19:01:31 UTC (rev 118221)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-23 19:03:26 UTC (rev 118222)
@@ -1,5 +1,22 @@
2012-05-23 Lucas Forschler <[email protected]>
+ Merge 117698
+
+ 2012-05-18 Anders Carlsson <[email protected]>
+
+ REGRESSION (r108181): corruption after scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=86934
+ <rdar://problem/11487337>
+
+ Reviewed by Dan Bernstein.
+
+ Use the flipped Y coordinate when resetting the scrolled rect.
+
+ * UIProcess/mac/BackingStoreMac.mm:
+ (WebKit::BackingStore::resetScrolledRect):
+
+2012-05-23 Lucas Forschler <[email protected]>
+
Merge 117539
2012-05-17 Philippe Normand <[email protected]>
Modified: branches/safari-536-branch/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm (118221 => 118222)
--- branches/safari-536-branch/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm 2012-05-23 19:01:31 UTC (rev 118221)
+++ branches/safari-536-branch/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm 2012-05-23 19:03:26 UTC (rev 118222)
@@ -105,9 +105,8 @@
CGContextScaleCTM(context.get(), m_deviceScaleFactor, m_deviceScaleFactor);
- CGContextTranslateCTM(context.get(), -m_scrolledRect.location().x(), -m_scrolledRect.location().y());
- CGContextTranslateCTM(context.get(), 0, m_scrolledRect.size().height());
CGContextScaleCTM(context.get(), 1, -1);
+ CGContextTranslateCTM(context.get(), -m_scrolledRect.x(), -m_scrolledRect.maxY());
paint(context.get(), m_scrolledRect);
IntRect sourceRect(IntPoint(), m_scrolledRect.size());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
