Title: [98143] branches/safari-534.52-branch/Source/WebCore
- Revision
- 98143
- Author
- lforsch...@apple.com
- Date
- 2011-10-21 14:01:07 -0700 (Fri, 21 Oct 2011)
Log Message
Merged r96874.
Modified Paths
Diff
Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98142 => 98143)
--- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 20:57:56 UTC (rev 98142)
+++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 21:01:07 UTC (rev 98143)
@@ -1,5 +1,20 @@
2011-10-21 Lucas Forschler <lforsch...@apple.com>
+ Merge 96874
+
+ 2011-10-06 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/9717490> Flash of white when navigating daringfireball.net
+ https://bugs.webkit.org/show_bug.cgi?id=69581
+
+ Reviewed by Darin Adler.
+
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::updateScrollbars): Moved the calls to Scrollbar::setEnabled() into the code
+ section where invalidation is suppressed if necessary, so that they do not trigger premature invalidation.
+
+2011-10-21 Lucas Forschler <lforsch...@apple.com>
+
Merge 95226
2011-09-15 Jon Lee <jon...@apple.com>
Modified: branches/safari-534.52-branch/Source/WebCore/platform/ScrollView.cpp (98142 => 98143)
--- branches/safari-534.52-branch/Source/WebCore/platform/ScrollView.cpp 2011-10-21 20:57:56 UTC (rev 98142)
+++ branches/safari-534.52-branch/Source/WebCore/platform/ScrollView.cpp 2011-10-21 21:01:07 UTC (rev 98143)
@@ -538,7 +538,6 @@
if (m_horizontalScrollbar) {
int clientWidth = visibleWidth();
- m_horizontalScrollbar->setEnabled(contentsWidth() > clientWidth);
int pageStep = max(max<int>(clientWidth * Scrollbar::minFractionToStepWhenPaging(), clientWidth - Scrollbar::maxOverlapBetweenPages()), 1);
IntRect oldRect(m_horizontalScrollbar->frameRect());
IntRect hBarRect = IntRect(0,
@@ -551,6 +550,7 @@
if (m_scrollbarsSuppressed)
m_horizontalScrollbar->setSuppressInvalidation(true);
+ m_horizontalScrollbar->setEnabled(contentsWidth() > clientWidth);
m_horizontalScrollbar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
m_horizontalScrollbar->setProportion(clientWidth, contentsWidth());
if (m_scrollbarsSuppressed)
@@ -559,7 +559,6 @@
if (m_verticalScrollbar) {
int clientHeight = visibleHeight();
- m_verticalScrollbar->setEnabled(contentsHeight() > clientHeight);
int pageStep = max(max<int>(clientHeight * Scrollbar::minFractionToStepWhenPaging(), clientHeight - Scrollbar::maxOverlapBetweenPages()), 1);
IntRect oldRect(m_verticalScrollbar->frameRect());
IntRect vBarRect = IntRect(m_boundsSize.width() - m_verticalScrollbar->width(),
@@ -572,6 +571,7 @@
if (m_scrollbarsSuppressed)
m_verticalScrollbar->setSuppressInvalidation(true);
+ m_verticalScrollbar->setEnabled(contentsHeight() > clientHeight);
m_verticalScrollbar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
m_verticalScrollbar->setProportion(clientHeight, contentsHeight());
if (m_scrollbarsSuppressed)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
