Changeset 96874 in webkit

Timestamp:

Oct 6, 2011 4:42:57 PM (13 years ago)

Author:

mitz@apple.com

Message:

<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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ScrollView.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-06  Dan Bernstein  <mitz@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-06  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -533 +533 @@
     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());
@@ -546 +545 @@
         if (m_scrollbarsSuppressed)
             m_horizontalScrollbar->setSuppressInvalidation(true);
+        m_horizontalScrollbar->setEnabled(contentsWidth() > clientWidth);
         m_horizontalScrollbar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
         m_horizontalScrollbar->setProportion(clientWidth, contentsWidth());
@@ -554 +554 @@
     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());
@@ -567 +566 @@
         if (m_scrollbarsSuppressed)
             m_verticalScrollbar->setSuppressInvalidation(true);
+        m_verticalScrollbar->setEnabled(contentsHeight() > clientHeight);
         m_verticalScrollbar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
         m_verticalScrollbar->setProportion(clientHeight, contentsHeight());