Title: [100154] branches/safari-534.52-branch/Source/WebCore
Diff
Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (100153 => 100154)
--- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-11-14 17:05:31 UTC (rev 100153)
+++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-11-14 17:10:13 UTC (rev 100154)
@@ -1,3 +1,25 @@
+2011-11-14 Lucas Forschler <[email protected]>
+
+ Merge 100022
+
+ 2011-11-11 Beth Dakin <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=72167
+ REGRESSION: Scroll position not restored on back after scroll
+ -and corresponding-
+ <rdar://problem/10410684>
+
+ Reviewed by Simon Fraser.
+
+ We can't just return early if we are not on an active page.
+ notifyPositionChanged() is called when a page is going into the page cache (and
+ therefore when not on an active page). We should not notify AppKit that the page
+ has scrolled in that case, but we still need to call
+ ScrollAnimator::notifyPositionChanged();. So this patch removes the early return,
+ and replaces it with a conditional around the relevant code.
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::notifyPositionChanged):
+
2011-11-08 Lucas Forschler <[email protected]>
Merge 99508
Modified: branches/safari-534.52-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (100153 => 100154)
--- branches/safari-534.52-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-11-14 17:05:31 UTC (rev 100153)
+++ branches/safari-534.52-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-11-14 17:10:13 UTC (rev 100154)
@@ -605,10 +605,12 @@
void ScrollAnimatorMac::notityPositionChanged()
{
- if (!scrollableArea()->isOnActivePage())
- return;
-#if USE(WK_SCROLLBAR_PAINTER)
- wkContentAreaScrolled(m_scrollbarPainterController.get());
+#if USE(SCROLLBAR_PAINTER)
+ // This function is called when a page is going into the page cache, but the page
+ // isn't really scrolling in that case. We should only pass the message on to the
+ // ScrollbarPainterController when we're really scrolling on an active page.
+ if (scrollableArea()->isOnActivePage())
+ [m_scrollbarPainterController.get() contentAreaScrolled];
#endif
ScrollAnimator::notityPositionChanged();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
