Changeset 107277 in webkit

Timestamp:

Feb 9, 2012 12:44:05 PM (12 years ago)

Author:

andersca@apple.com

Message:

The scrolling tree should know more about the scrollbar state
​https://bugs.webkit.org/show_bug.cgi?id=78268

Reviewed by Andreas Kling.

With this change, the scroll tree now keeps track of the horizontal scroll elasticity,
the vertical scroll elasticity and whether the page has enabled scrollbars.

This is needed in order to make rubber-banding work correctly when doing fast scrolling.

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::frameViewLayoutUpdated):

• page/scrolling/ScrollingTreeNode.cpp:

(WebCore::ScrollingTreeNode::ScrollingTreeNode):
(WebCore::ScrollingTreeNode::update):

• page/scrolling/ScrollingTreeNode.h:

(ScrollingTreeNode):

• page/scrolling/ScrollingTreeState.cpp:

(WebCore::ScrollingTreeState::ScrollingTreeState):
(WebCore::ScrollingTreeState::setHorizontalScrollElasticity):
(WebCore):
(WebCore::ScrollingTreeState::setVerticalScrollElasticity):
(WebCore::ScrollingTreeState::setHasEnabledHorizontalScrollbar):
(WebCore::ScrollingTreeState::setHasEnabledVerticalScrollbar):

• page/scrolling/ScrollingTreeState.h:

(WebCore::ScrollingTreeState::horizontalScrollElasticity):
(ScrollingTreeState):
(WebCore::ScrollingTreeState::verticalScrollElasticity):
(WebCore::ScrollingTreeState::hasEnabledHorizontalScrollbar):
(WebCore::ScrollingTreeState::hasEnabledVerticalScrollbar):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/ScrollingCoordinator.cpp (modified) (1 diff)
• page/scrolling/ScrollingTreeNode.cpp (modified) (2 diffs)
• page/scrolling/ScrollingTreeNode.h (modified) (2 diffs)
• page/scrolling/ScrollingTreeState.cpp (modified) (2 diffs)
• page/scrolling/ScrollingTreeState.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-09  Anders Carlsson  <andersca@apple.com>
+
+        The scrolling tree should know more about the scrollbar state
+        https://bugs.webkit.org/show_bug.cgi?id=78268
+
+        Reviewed by Andreas Kling.
+
+        With this change, the scroll tree now keeps track of the horizontal scroll elasticity,
+        the vertical scroll elasticity and whether the page has enabled scrollbars.
+
+        This is needed in order to make rubber-banding work correctly when doing fast scrolling.
+
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::frameViewLayoutUpdated):
+        * page/scrolling/ScrollingTreeNode.cpp:
+        (WebCore::ScrollingTreeNode::ScrollingTreeNode):
+        (WebCore::ScrollingTreeNode::update):
+        * page/scrolling/ScrollingTreeNode.h:
+        (ScrollingTreeNode):
+        * page/scrolling/ScrollingTreeState.cpp:
+        (WebCore::ScrollingTreeState::ScrollingTreeState):
+        (WebCore::ScrollingTreeState::setHorizontalScrollElasticity):
+        (WebCore):
+        (WebCore::ScrollingTreeState::setVerticalScrollElasticity):
+        (WebCore::ScrollingTreeState::setHasEnabledHorizontalScrollbar):
+        (WebCore::ScrollingTreeState::setHasEnabledVerticalScrollbar):
+        * page/scrolling/ScrollingTreeState.h:
+        (WebCore::ScrollingTreeState::horizontalScrollElasticity):
+        (ScrollingTreeState):
+        (WebCore::ScrollingTreeState::verticalScrollElasticity):
+        (WebCore::ScrollingTreeState::hasEnabledHorizontalScrollbar):
+        (WebCore::ScrollingTreeState::hasEnabledVerticalScrollbar):
+
 2012-02-09  Xianzhu Wang  <wangxianzhu@chromium.org>
 

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

@@ -116 +116 @@
     }
 
+    m_scrollingTreeState->setHorizontalScrollElasticity(frameView->horizontalScrollElasticity());
+    m_scrollingTreeState->setVerticalScrollElasticity(frameView->verticalScrollElasticity());
+    m_scrollingTreeState->setHasEnabledHorizontalScrollbar(frameView->horizontalScrollbar() && frameView->horizontalScrollbar()->enabled());
+    m_scrollingTreeState->setHasEnabledVerticalScrollbar(frameView->verticalScrollbar() && frameView->verticalScrollbar()->enabled());
+
     m_scrollingTreeState->setViewportRect(IntRect(IntPoint(), frameView->visibleContentRect().size()));
     m_scrollingTreeState->setContentsSize(frameView->contentsSize());

trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp

@@ -35 +35 @@
 ScrollingTreeNode::ScrollingTreeNode(ScrollingTree* scrollingTree)
     : m_scrollingTree(scrollingTree)
+    , m_horizontalScrollElasticity(ScrollElasticityNone)
+    , m_verticalScrollElasticity(ScrollElasticityNone)
+    , m_hasEnabledHorizontalScrollbar(false)
+    , m_hasEnabledVerticalScrollbar(false)
 {
 }
@@ -49 +53 @@
     if (state->changedProperties() & ScrollingTreeState::ContentsSize)
         m_contentsSize = state->contentsSize();
+
+    if (state->changedProperties() & ScrollingTreeState::HorizontalScrollElasticity)
+        m_horizontalScrollElasticity = state->horizontalScrollElasticity();
+
+    if (state->changedProperties() & ScrollingTreeState::VerticalScrollElasticity)
+        m_verticalScrollElasticity = state->verticalScrollElasticity();
+
+    if (state->changedProperties() & ScrollingTreeState::HasEnabledHorizontalScrollbar)
+        m_hasEnabledHorizontalScrollbar = state->hasEnabledHorizontalScrollbar();
+
+    if (state->changedProperties() & ScrollingTreeState::HasEnabledVerticalScrollbar)
+        m_hasEnabledVerticalScrollbar = state->hasEnabledVerticalScrollbar();
 }
 

trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h

@@ -30 +30 @@
 
 #include "IntRect.h"
+#include "ScrollTypes.h"
 #include <wtf/PassOwnPtr.h>
 
@@ -58 +59 @@
     IntRect m_viewportRect;
     IntSize m_contentsSize;
+
+    ScrollElasticity m_horizontalScrollElasticity;
+    ScrollElasticity m_verticalScrollElasticity;
+    
+    bool m_hasEnabledHorizontalScrollbar;
+    bool m_hasEnabledVerticalScrollbar;
 };
 

trunk/Source/WebCore/page/scrolling/ScrollingTreeState.cpp

@@ -39 +39 @@
     : m_changedProperties(0)
     , m_wheelEventHandlerCount(0)
+    , m_horizontalScrollElasticity(ScrollElasticityNone)
+    , m_verticalScrollElasticity(ScrollElasticityNone)
+    , m_hasEnabledHorizontalScrollbar(false)
+    , m_hasEnabledVerticalScrollbar(false)
 {
 }
@@ -82 +86 @@
 }
 
+void ScrollingTreeState::setHorizontalScrollElasticity(ScrollElasticity horizontalScrollElasticity)
+{
+    if (m_horizontalScrollElasticity == horizontalScrollElasticity)
+        return;
+
+    m_horizontalScrollElasticity = horizontalScrollElasticity;
+    m_changedProperties |= HorizontalScrollElasticity;
+}
+
+void ScrollingTreeState::setVerticalScrollElasticity(ScrollElasticity verticalScrollElasticity)
+{
+    if (m_verticalScrollElasticity == verticalScrollElasticity)
+        return;
+
+    m_verticalScrollElasticity = verticalScrollElasticity;
+    m_changedProperties |= VerticalScrollElasticity;
+}
+
+void ScrollingTreeState::setHasEnabledHorizontalScrollbar(bool hasEnabledHorizontalScrollbar)
+{
+    if (m_hasEnabledHorizontalScrollbar == hasEnabledHorizontalScrollbar)
+        return;
+
+    m_hasEnabledHorizontalScrollbar = hasEnabledHorizontalScrollbar;
+    m_changedProperties |= HasEnabledHorizontalScrollbar;
+}
+
+void ScrollingTreeState::setHasEnabledVerticalScrollbar(bool hasEnabledVerticalScrollbar)
+{
+    if (m_hasEnabledVerticalScrollbar == hasEnabledVerticalScrollbar)
+        return;
+
+    m_hasEnabledVerticalScrollbar = hasEnabledVerticalScrollbar;
+    m_changedProperties |= HasEnabledVerticalScrollbar;
+}
+
 PassOwnPtr<ScrollingTreeState> ScrollingTreeState::commit()
 {

trunk/Source/WebCore/page/scrolling/ScrollingTreeState.h

@@ -32 +32 @@
 #include "IntRect.h"
 #include "Region.h"
+#include "ScrollTypes.h"
 #include <wtf/PassOwnPtr.h>
 
@@ -54 +55 @@
         NonFastScrollableRegion = 1 << 2,
         WheelEventHandlerCount = 1 << 3,
-        ScrollLayer = 1 << 4,
+        HorizontalScrollElasticity = 1 << 4,
+        VerticalScrollElasticity = 1 << 5,
+        HasEnabledHorizontalScrollbar = 1 << 6,
+        HasEnabledVerticalScrollbar = 1 << 7,
+        ScrollLayer = 1 << 8,
     };
 
@@ -71 +76 @@
     unsigned wheelEventHandlerCount() const { return m_wheelEventHandlerCount; }
     void setWheelEventHandlerCount(unsigned);
+
+    ScrollElasticity horizontalScrollElasticity() const { return m_horizontalScrollElasticity; }
+    void setHorizontalScrollElasticity(ScrollElasticity);
+
+    ScrollElasticity verticalScrollElasticity() const { return m_verticalScrollElasticity; }
+    void setVerticalScrollElasticity(ScrollElasticity);
+
+    bool hasEnabledHorizontalScrollbar() const { return m_hasEnabledHorizontalScrollbar; }
+    void setHasEnabledHorizontalScrollbar(bool);
+
+    bool hasEnabledVerticalScrollbar() const { return m_hasEnabledVerticalScrollbar; }
+    void setHasEnabledVerticalScrollbar(bool);
 
     PlatformLayer* platformScrollLayer() const;
@@ -90 +107 @@
     unsigned m_wheelEventHandlerCount;
 
+    ScrollElasticity m_horizontalScrollElasticity;
+    ScrollElasticity m_verticalScrollElasticity;
+
+    bool m_hasEnabledHorizontalScrollbar;
+    bool m_hasEnabledVerticalScrollbar;
+
 #if PLATFORM(MAC)
     RetainPtr<PlatformLayer> m_platformScrollLayer;