Changeset 90478 in webkit

Timestamp:

Jul 6, 2011 12:04:47 PM (13 years ago)

Author:

ryuan.choi@samsung.com

Message:

2011-07-06 Ryuan Choi <​ryuan.choi@samsung.com>

[Performance] Only call sendContentResizeNotification when the scrollbar actually did change
​https://bugs.webkit.org/show_bug.cgi?id=47320

Reviewed by Eric Seidel.

Move avoidScrollbarCreation checking code from setHasHorizontalScrollbar
and setHasVerticalScrollbar to their caller in order to keep sendContentResizedNotification
false in case scrollbar is not really changed.
As a result, it will remove unnecessary relayout in the above case.

No new tests as this is very hard to write tests for. The bug only
occured when scrolling the sites which contain frame in browser with
frameFlattening. This should not change functionality in other case.

• platform/ScrollView.cpp: (WebCore::ScrollView::setHasHorizontalScrollbar): (WebCore::ScrollView::setHasVerticalScrollbar): (WebCore::ScrollView::updateScrollbars):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-06  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [Performance] Only call sendContentResizeNotification when the scrollbar actually did change
+        https://bugs.webkit.org/show_bug.cgi?id=47320
+
+        Reviewed by Eric Seidel.
+
+        Move avoidScrollbarCreation checking code from setHasHorizontalScrollbar
+        and setHasVerticalScrollbar to their caller in order to keep sendContentResizedNotification
+        false in case scrollbar is not really changed.
+        As a result, it will remove unnecessary relayout in the above case.
+
+        No new tests as this is very hard to write tests for. The bug only
+        occured when scrolling the sites which contain frame in browser with
+        frameFlattening. This should not change functionality in other case.
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::setHasHorizontalScrollbar):
+        (WebCore::ScrollView::setHasVerticalScrollbar):
+        (WebCore::ScrollView::updateScrollbars):
+
 2011-07-06  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -89 +89 @@
 void ScrollView::setHasHorizontalScrollbar(bool hasBar)
 {
-    if (hasBar && avoidScrollbarCreation())
-        return;
-
+    ASSERT(!hasBar || !avoidScrollbarCreation());
     if (hasBar && !m_horizontalScrollbar) {
         m_horizontalScrollbar = createScrollbar(HorizontalScrollbar);
@@ -109 +107 @@
 void ScrollView::setHasVerticalScrollbar(bool hasBar)
 {
-    if (hasBar && avoidScrollbarCreation())
-        return;
-
+    ASSERT(!hasBar || !avoidScrollbarCreation());
     if (hasBar && !m_verticalScrollbar) {
         m_verticalScrollbar = createScrollbar(VerticalScrollbar);
@@ -473 +469 @@
 
     if (m_scrollbarsSuppressed || (hScroll != ScrollbarAuto && vScroll != ScrollbarAuto)) {
-        if (hasHorizontalScrollbar != newHasHorizontalScrollbar)
+        if (hasHorizontalScrollbar != newHasHorizontalScrollbar && (hasHorizontalScrollbar || !avoidScrollbarCreation()))
             setHasHorizontalScrollbar(newHasHorizontalScrollbar);
-        if (hasVerticalScrollbar != newHasVerticalScrollbar)
+        if (hasVerticalScrollbar != newHasVerticalScrollbar && (hasVerticalScrollbar || !avoidScrollbarCreation()))
             setHasVerticalScrollbar(newHasVerticalScrollbar);
     } else {
@@ -501 +497 @@
             newHasHorizontalScrollbar = false;
 
-        if (hasHorizontalScrollbar != newHasHorizontalScrollbar) {
+        if (hasHorizontalScrollbar != newHasHorizontalScrollbar && (hasHorizontalScrollbar || !avoidScrollbarCreation())) {
             if (m_scrollOrigin.y() && !newHasHorizontalScrollbar)
                 m_scrollOrigin.setY(m_scrollOrigin.y() - m_horizontalScrollbar->height());
@@ -508 +504 @@
         }
 
-        if (hasVerticalScrollbar != newHasVerticalScrollbar) {
+        if (hasVerticalScrollbar != newHasVerticalScrollbar && (hasVerticalScrollbar || !avoidScrollbarCreation())) {
             if (m_scrollOrigin.x() && !newHasVerticalScrollbar)
                 m_scrollOrigin.setX(m_scrollOrigin.x() - m_verticalScrollbar->width());