Title: [101872] branches/safari-534.53-branch/Source/WebCore
- Revision
- 101872
- Author
- [email protected]
- Date
- 2011-12-02 15:54:37 -0800 (Fri, 02 Dec 2011)
Log Message
Merge 100809.
Modified Paths
Diff
Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (101871 => 101872)
--- branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-12-02 23:48:50 UTC (rev 101871)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-12-02 23:54:37 UTC (rev 101872)
@@ -1,3 +1,21 @@
+2011-12-02 Lucas Forschler <[email protected]>
+
+ Merge 100809
+
+ 2011-11-18 Beth Dakin <[email protected]>
+
+ <rdar://problem/10466170> Regression: Scroll bars disappear and don't come back
+
+ Reviewed by Sam Weinig.
+
+ Fixing a merge issue. On TOT we use #if USE(SCROLLBAR_PAINTER), but on the branch
+ it is still #if USE(WK_SCROLLBAR_PAINTER). Also, on the branch, all of the
+ m_scrollbarPainterController functions go through WebKitSystemInterface instead of
+ using forward declaration. We should consider merging those changes, but in the
+ meantime, for this to work, we have to go back to the branch-style.
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::notityPositionChanged):
+
2011-11-30 Lucas Forschler <[email protected]>
Merge 94953
Modified: branches/safari-534.53-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (101871 => 101872)
--- branches/safari-534.53-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-12-02 23:48:50 UTC (rev 101871)
+++ branches/safari-534.53-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-12-02 23:54:37 UTC (rev 101872)
@@ -605,12 +605,12 @@
void ScrollAnimatorMac::notityPositionChanged()
{
-#if USE(SCROLLBAR_PAINTER)
+#if USE(WK_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];
+ wkContentAreaScrolled(m_scrollbarPainterController.get());
#endif
ScrollAnimator::notityPositionChanged();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
