Changeset 48064 in webkit

Timestamp:

Sep 4, 2009 10:59:46 AM (15 years ago)

Author:

Dimitri Glazkov

Message:

WebCore:

2009-09-04 Mark Mentovai <​mark@chromium.org>

Reviewed by Dave Hyatt.

​https://bugs.webkit.org/show_bug.cgi?id=28614

Account for scrollbar state changes that occur during layout.

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

Perform a layout prior to checking whether the scrollbar modes are
off, on, or automatic. The modes may change during layout.

• WebCore.base.exp:
• WebCore.order:
• page/Frame.cpp: (WebCore::Frame::createView):
• page/FrameView.cpp: (WebCore::FrameView::FrameView): (WebCore::FrameView::resetScrollbars): (WebCore::FrameView::layout):
• page/FrameView.h:
• platform/ScrollView.h:

Eliminate duplicated (and incorrect) scrollbar mode tracking between
FrameView and ScrollView.

WebKit/mac:

2009-09-04 Mark Mentovai <​mark@chromium.org>

Reviewed by Dave Hyatt.

​https://bugs.webkit.org/show_bug.cgi?id=28614

Account for scrollbar state changes that occur during layout.

• WebView/WebDynamicScrollBarsView.mm: (-[WebDynamicScrollBarsView updateScrollers]):

Perform a layout prior to checking whether the scrollbar modes are
off, on, or automatic. The modes may change during layout.

• WebView/WebFrameView.mm: (-[WebFrameView _install]):

Eliminate duplicated (and incorrect) scrollbar mode tracking between
FrameView and ScrollView.

WebKit/qt:

2009-09-04 Mark Mentovai <​mark@chromium.org>

Reviewed by Dave Hyatt.

​https://bugs.webkit.org/show_bug.cgi?id=28614

Account for scrollbar state changes that occur during layout.

• Api/qwebframe.cpp: (QWebFrame::setScrollBarPolicy):

Eliminate duplicated (and incorrect) scrollbar mode tracking between
FrameView and ScrollView.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.base.exp (modified) (1 diff)
• WebCore/WebCore.order (modified) (2 diffs)
• WebCore/page/Frame.cpp (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (5 diffs)
• WebCore/page/FrameView.h (modified) (4 diffs)
• WebCore/platform/ScrollView.cpp (modified) (2 diffs)
• WebCore/platform/ScrollView.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebDynamicScrollBarsView.mm (modified) (2 diffs)
• WebKit/mac/WebView/WebFrameView.mm (modified) (1 diff)
• WebKit/qt/Api/qwebframe.cpp (modified) (2 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-04  Mark Mentovai  <mark@chromium.org>
+
+        Reviewed by Dave Hyatt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28614
+
+        Account for scrollbar state changes that occur during layout.
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::updateScrollbars):
+
+        Perform a layout prior to checking whether the scrollbar modes are
+        off, on, or automatic.  The modes may change during layout.
+
+        * WebCore.base.exp:
+        * WebCore.order:
+        * page/Frame.cpp:
+        (WebCore::Frame::createView):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::FrameView):
+        (WebCore::FrameView::resetScrollbars):
+        (WebCore::FrameView::layout):
+        * page/FrameView.h:
+        * platform/ScrollView.h:
+
+        Eliminate duplicated (and incorrect) scrollbar mode tracking between
+        FrameView and ScrollView.
+
 2009-09-04  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/WebCore/WebCore.base.exp

@@ -693 +693 @@
 __ZN7WebCore9FrameView12setMediaTypeERKNS_6StringE
 __ZN7WebCore9FrameView14adjustViewSizeEv
-__ZN7WebCore9FrameView14initScrollbarsEv
 __ZN7WebCore9FrameView14setMarginWidthEi
 __ZN7WebCore9FrameView14setNeedsLayoutEv

trunk/WebCore/WebCore.order

@@ -335 +335 @@
 __ZN7WebCore6Widget21releasePlatformWidgetEv
 __ZN7WebCore6Widget20retainPlatformWidgetEv
-__ZN7WebCore9FrameView14initScrollbarsEv
-__ZN7WebCore9FrameView27updateDefaultScrollbarStateEv
 __ZNK7WebCore10ScrollView14scrollbarModesERNS_13ScrollbarModeES2_
 __ZNK7WebCore10ScrollView22platformScrollbarModesERNS_13ScrollbarModeES2_
@@ -5760 +5758 @@
 __ZN7WebCore10ScrollView16platformAddChildEPNS_6WidgetE
 __ZN7WebCore16RenderPartObject11viewClearedEv
-__ZN7WebCore9FrameView20setCanHaveScrollbarsEb
 __ZN7WebCore10ScrollView20setCanHaveScrollbarsEb
 __ZNK7WebCore14SecurityOrigin9canAccessEPKS0_

trunk/WebCore/page/Frame.cpp

@@ -1794 +1794 @@
 
     frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode);
-    frameView->updateDefaultScrollbarState();
 
     setView(frameView);

trunk/WebCore/page/FrameView.cpp

@@ -94 +94 @@
 FrameView::FrameView(Frame* frame)
     : m_frame(frame)
-    , m_vmode(ScrollbarAuto)
-    , m_hmode(ScrollbarAuto)
     , m_slowRepaintObjectCount(0)
     , m_layoutTimer(this, &FrameView::layoutTimerFired)
     , m_layoutRoot(0)
     , m_postLayoutTasksTimer(this, &FrameView::postLayoutTimerFired)
-    , m_needToInitScrollbars(true)
     , m_isTransparent(false)
     , m_baseBackgroundColor(Color::white)
@@ -211 +208 @@
     m_firstLayout = true;
     setScrollbarsSuppressed(true);
-    setScrollbarModes(m_hmode, m_vmode);
+    setScrollbarModes(ScrollbarAuto, ScrollbarAuto);
     setScrollbarsSuppressed(false);
 }
@@ -285 +282 @@
 }
 
-void FrameView::initScrollbars()
-{
-    if (!m_needToInitScrollbars)
-        return;
-    m_needToInitScrollbars = false;
-    updateDefaultScrollbarState();
-}
-
-void FrameView::updateDefaultScrollbarState()
-{
-    m_hmode = horizontalScrollbarMode();
-    m_vmode = verticalScrollbarMode();
-    setScrollbarModes(m_hmode, m_vmode);
-}
-
 void FrameView::invalidateRect(const IntRect& rect)
 {
@@ -331 +313 @@
     // make it update the rendering area when set
     m_margins.setHeight(h);
-}
-
-void FrameView::setCanHaveScrollbars(bool canScroll)
-{
-    ScrollView::setCanHaveScrollbars(canScroll);
-    scrollbarModes(m_hmode, m_vmode);
 }
 
@@ -578 +554 @@
     m_nestedLayoutCount++;
 
-    ScrollbarMode hMode = m_hmode;
-    ScrollbarMode vMode = m_vmode;
+    ScrollbarMode hMode;
+    ScrollbarMode vMode;
+    scrollbarModes(hMode, vMode);
 
     if (!subtree) {

trunk/WebCore/page/FrameView.h

@@ -70 +70 @@
     void setMarginHeight(int);
 
-    virtual void setCanHaveScrollbars(bool);
-
     virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
 
@@ -123 +121 @@
 
     void adjustViewSize();
-    void initScrollbars();
-    void updateDefaultScrollbarState();
     
     virtual IntRect windowClipRect(bool clipToContents = true) const;
@@ -252 +248 @@
     bool m_doFullRepaint;
     
-    ScrollbarMode m_vmode;
-    ScrollbarMode m_hmode;
     bool m_useSlowRepaints;
     bool m_isOverlapped;
@@ -273 +267 @@
 
     bool m_firstLayout;
-    bool m_needToInitScrollbars;
     bool m_isTransparent;
     Color m_baseBackgroundColor;

trunk/WebCore/platform/ScrollView.cpp

@@ -330 +330 @@
         return;
 
+    // If we came in here with the view already needing a layout, then go ahead and do that
+    // first.  (This will be the common case, e.g., when the page changes due to window resizing for example).
+    // This layout will not re-enter updateScrollbars and does not count towards our max layout pass total.
+    if (!m_scrollbarsSuppressed) {
+        m_inUpdateScrollbars = true;
+        visibleContentsResized();
+        m_inUpdateScrollbars = false;
+    }
+
     bool hasHorizontalScrollbar = m_horizontalScrollbar;
     bool hasVerticalScrollbar = m_verticalScrollbar;
@@ -350 +359 @@
             setHasVerticalScrollbar(newHasVerticalScrollbar);
     } else {
-        // If we came in here with the view already needing a layout, then go ahead and do that
-        // first.  (This will be the common case, e.g., when the page changes due to window resizing for example).
-        // This layout will not re-enter updateScrollers and does not count towards our max layout pass total.
-        m_inUpdateScrollbars = true;
-        visibleContentsResized();
-        m_inUpdateScrollbars = false;
-
         bool sendContentResizedNotification = false;
         

trunk/WebCore/platform/ScrollView.h

@@ -90 +90 @@
     ScrollbarMode horizontalScrollbarMode() const { ScrollbarMode horizontal, vertical; scrollbarModes(horizontal, vertical); return horizontal; }
     ScrollbarMode verticalScrollbarMode() const { ScrollbarMode horizontal, vertical; scrollbarModes(horizontal, vertical); return vertical; }
-    virtual void setCanHaveScrollbars(bool flag);
+    void setCanHaveScrollbars(bool flag);
     bool canHaveScrollbars() const { return horizontalScrollbarMode() != ScrollbarAlwaysOff || verticalScrollbarMode() != ScrollbarAlwaysOff; }
 

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2009-09-04  Mark Mentovai  <mark@chromium.org>
+
+        Reviewed by Dave Hyatt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28614
+
+        Account for scrollbar state changes that occur during layout.
+
+        * WebView/WebDynamicScrollBarsView.mm:
+        (-[WebDynamicScrollBarsView updateScrollers]):
+
+        Perform a layout prior to checking whether the scrollbar modes are
+        off, on, or automatic.  The modes may change during layout.
+
+        * WebView/WebFrameView.mm:
+        (-[WebFrameView _install]):
+
+        Eliminate duplicated (and incorrect) scrollbar mode tracking between
+        FrameView and ScrollView.
+
 2009-09-03  Dave Hyatt  <hyatt@apple.com>
 

trunk/WebKit/mac/WebView/WebDynamicScrollBarsView.mm

@@ -90 +90 @@
 - (void)updateScrollers
 {
+    NSView *documentView = [self documentView];
+
+    // If we came in here with the view already needing a layout, then go ahead and do that
+    // first.  (This will be the common case, e.g., when the page changes due to window resizing for example).
+    // This layout will not re-enter updateScrollers and does not count towards our max layout pass total.
+    if (!suppressLayout && !suppressScrollers && [documentView isKindOfClass:[WebHTMLView class]]) {
+        WebHTMLView* htmlView = (WebHTMLView*)documentView;
+        if ([htmlView _needsLayout]) {
+            inUpdateScrollers = YES;
+            [(id <WebDocumentView>)documentView layout];
+            inUpdateScrollers = NO;
+        }
+    }
+
+    BOOL hasHorizontalScroller = [self hasHorizontalScroller];
     BOOL hasVerticalScroller = [self hasVerticalScroller];
-    BOOL hasHorizontalScroller = [self hasHorizontalScroller];
     
     BOOL newHasHorizontalScroller = hasHorizontalScroller;
     BOOL newHasVerticalScroller = hasVerticalScroller;
     
-    BOOL needsLayout = NO;
-
-    NSView *documentView = [self documentView];
     if (!documentView) {
         newHasHorizontalScroller = NO;
@@ -123 +134 @@
     }
 
-    needsLayout = NO;
-
-    // If we came in here with the view already needing a layout, then go ahead and do that
-    // first.  (This will be the common case, e.g., when the page changes due to window resizing for example).
-    // This layout will not re-enter updateScrollers and does not count towards our max layout pass total.
-    if ([documentView isKindOfClass:[WebHTMLView class]]) {
-        WebHTMLView* htmlView = (WebHTMLView*)documentView;
-        if ([htmlView _needsLayout]) {
-            inUpdateScrollers = YES;
-            [(id <WebDocumentView>)documentView layout];
-            inUpdateScrollers = NO;
-        }
-    }
+    BOOL needsLayout = NO;
 
     NSSize documentSize = [documentView frame].size;

trunk/WebKit/mac/WebView/WebFrameView.mm

@@ -274 +274 @@
         // Now the render part owns the view, so we don't any more.
     }
-
-    view->initScrollbars();
 }
 

trunk/WebKit/qt/Api/qwebframe.cpp

@@ -802 +802 @@
         if (d->frame->view()) {
             d->frame->view()->setHorizontalScrollbarMode((ScrollbarMode)policy);
-            d->frame->view()->updateDefaultScrollbarState();
         }
     } else {
@@ -808 +807 @@
         if (d->frame->view()) {
             d->frame->view()->setVerticalScrollbarMode((ScrollbarMode)policy);
-            d->frame->view()->updateDefaultScrollbarState();
         }
     }

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-09-04  Mark Mentovai  <mark@chromium.org>
+
+        Reviewed by Dave Hyatt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28614
+
+        Account for scrollbar state changes that occur during layout.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::setScrollBarPolicy):
+
+        Eliminate duplicated (and incorrect) scrollbar mode tracking between
+        FrameView and ScrollView.
+
 2009-09-04  Laszlo Gombos  <laszlo.1.gombos@nokia.com>