Changeset 83672 in webkit

Timestamp:

Apr 12, 2011 5:20:11 PM (13 years ago)

Author:

weinig@apple.com

Message:

2011-04-12 Sam Weinig <​sam@webkit.org>

Reviewed by Simon Fraser.

Frames prevent scrolling containing page
<rdar://problem/8990409>
​https://bugs.webkit.org/show_bug.cgi?id=58392

Also fixes:
Should rubber-band on pages with no scrollbars
<rdar://problem/9034280>

• page/FrameView.cpp: (WebCore::FrameView::FrameView): Make the main frame rubber-band horizontally and vertically always.

• platform/ScrollTypes.h: Add ScrollElasticity enum.

• platform/ScrollableArea.cpp: Default to no elasticity.

(WebCore::ScrollableArea::ScrollableArea):

• platform/ScrollableArea.h: (WebCore::ScrollableArea::setVerticalScrollElasticity): (WebCore::ScrollableArea::verticalScrollElasticity): (WebCore::ScrollableArea::setHorizontalScrollElasticity): (WebCore::ScrollableArea::horizontalScrollElasticity): Add state for horizontal and vertical elasticity.

• platform/mac/ScrollAnimatorMac.mm: (WebCore::ScrollAnimatorMac::handleWheelEvent): Bail out of new scrolling behavior if we can't rubber-band. By bailing before accepting the wheel event, we allow the wheel event to be forwarded. We will need to refine this logic to allow subframe scrolling in the future.

(WebCore::ScrollAnimatorMac::allowsVerticalStretching):
(WebCore::ScrollAnimatorMac::allowsHorizontalStretching):
Switch stretching behavior based on the ScrollableArea's elasticity.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• platform/ScrollTypes.h (modified) (1 diff)
• platform/ScrollableArea.cpp (modified) (1 diff)
• platform/ScrollableArea.h (modified) (2 diffs)
• platform/mac/ScrollAnimatorMac.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-12  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Simon Fraser.
+
+        Frames prevent scrolling containing page
+        <rdar://problem/8990409>
+        https://bugs.webkit.org/show_bug.cgi?id=58392
+
+        Also fixes:
+        Should rubber-band on pages with no scrollbars
+        <rdar://problem/9034280>
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::FrameView):
+        Make the main frame rubber-band horizontally and vertically always.
+
+        * platform/ScrollTypes.h:
+        Add ScrollElasticity enum.
+
+        * platform/ScrollableArea.cpp:
+        Default to no elasticity.
+
+        (WebCore::ScrollableArea::ScrollableArea):
+        * platform/ScrollableArea.h:
+        (WebCore::ScrollableArea::setVerticalScrollElasticity):
+        (WebCore::ScrollableArea::verticalScrollElasticity):
+        (WebCore::ScrollableArea::setHorizontalScrollElasticity):
+        (WebCore::ScrollableArea::horizontalScrollElasticity):
+        Add state for horizontal and vertical elasticity.
+
+        * platform/mac/ScrollAnimatorMac.mm:
+        (WebCore::ScrollAnimatorMac::handleWheelEvent):
+        Bail out of new scrolling behavior if we can't rubber-band. By bailing before
+        accepting the wheel event, we allow the wheel event to be forwarded. We will
+        need to refine this logic to allow subframe scrolling in the future.
+
+        (WebCore::ScrollAnimatorMac::allowsVerticalStretching):
+        (WebCore::ScrollAnimatorMac::allowsHorizontalStretching):
+        Switch stretching behavior based on the ScrollableArea's elasticity.
+
 2011-04-12  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -141 +141 @@
             m_page = page;
             m_page->addScrollableArea(this);
+
+            if (m_frame == m_page->mainFrame()) {
+                ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
+                ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
+            }
         }
     }

trunk/Source/WebCore/platform/ScrollTypes.h

@@ -109 +109 @@
     };
 
+    enum ScrollElasticity {
+        ScrollElasticityAutomatic,
+        ScrollElasticityNone,
+        ScrollElasticityAllowed
+    };
+
     enum ScrollbarOrientation { HorizontalScrollbar, VerticalScrollbar };
 

trunk/Source/WebCore/platform/ScrollableArea.cpp

@@ -45 +45 @@
     , m_constrainsScrollingToContentEdge(true)
     , m_inLiveResize(false)
+    , m_verticalScrollElasticity(ScrollElasticityNone)
+    , m_horizontalScrollElasticity(ScrollElasticityNone)
 {
 }

trunk/Source/WebCore/platform/ScrollableArea.h

@@ -57 +57 @@
     bool constrainsScrollingToContentEdge() const { return m_constrainsScrollingToContentEdge; }
     void setConstrainsScrollingToContentEdge(bool constrainsScrollingToContentEdge) { m_constrainsScrollingToContentEdge = constrainsScrollingToContentEdge; }
+
+    void setVerticalScrollElasticity(ScrollElasticity scrollElasticity) { m_verticalScrollElasticity = scrollElasticity; }
+    ScrollElasticity verticalScrollElasticity() const { return m_verticalScrollElasticity; }
+
+    void setHorizontalScrollElasticity(ScrollElasticity scrollElasticity) { m_horizontalScrollElasticity = scrollElasticity; }
+    ScrollElasticity horizontalScrollElasticity() const { return m_horizontalScrollElasticity; }
 
     bool inLiveResize() const { return m_inLiveResize; }
@@ -131 +137 @@
     bool m_inLiveResize;
 
+    ScrollElasticity m_verticalScrollElasticity;
+    ScrollElasticity m_horizontalScrollElasticity;
+
 protected:
     // There are 8 possible combinations of writing mode and direction. Scroll origin will be non-zero in the x or y axis

trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm

@@ -790 +790 @@
     }
 
+    // FIXME: This is somewhat roundabout hack to allow forwarding wheel events
+    // up to the parent scrollable area. It takes advantage of the fact that
+    // the base class implemenatation of handleWheelEvent will not accept the
+    // wheel event if there is nowhere to scroll.
+    if (fabsf(wheelEvent.deltaY()) >= fabsf(wheelEvent.deltaX())) {
+        if (!allowsVerticalStretching()) {
+            ScrollAnimator::handleWheelEvent(wheelEvent);
+            return;
+        }
+    } else {
+        if (!allowsHorizontalStretching()) {
+            ScrollAnimator::handleWheelEvent(wheelEvent);
+            return;
+        }
+    }
+
     wheelEvent.accept();
 
@@ -838 +854 @@
 bool ScrollAnimatorMac::allowsVerticalStretching() const
 {
-    Scrollbar* hScroller = m_scrollableArea->horizontalScrollbar();
-    Scrollbar* vScroller = m_scrollableArea->verticalScrollbar();
-    if (((vScroller && vScroller->enabled()) || (!hScroller || !hScroller->enabled())))
+    switch (m_scrollableArea->verticalScrollElasticity()) {
+    case ScrollElasticityAutomatic: {
+        Scrollbar* hScroller = m_scrollableArea->horizontalScrollbar();
+        Scrollbar* vScroller = m_scrollableArea->verticalScrollbar();
+        return (((vScroller && vScroller->enabled()) || (!hScroller || !hScroller->enabled())));
+    }
+    case ScrollElasticityNone:
+        return false;
+    case ScrollElasticityAllowed:
         return true;
-
+    }
+
+    ASSERT_NOT_REACHED();
     return false;
 }
@@ -848 +872 @@
 bool ScrollAnimatorMac::allowsHorizontalStretching() const
 {
-    Scrollbar* hScroller = m_scrollableArea->horizontalScrollbar();
-    Scrollbar* vScroller = m_scrollableArea->verticalScrollbar();
-    if (((hScroller && hScroller->enabled()) || (!vScroller || !vScroller->enabled())))
+    switch (m_scrollableArea->horizontalScrollElasticity()) {
+    case ScrollElasticityAutomatic: {
+        Scrollbar* hScroller = m_scrollableArea->horizontalScrollbar();
+        Scrollbar* vScroller = m_scrollableArea->verticalScrollbar();
+        return (((hScroller && hScroller->enabled()) || (!vScroller || !vScroller->enabled())));
+    }
+    case ScrollElasticityNone:
+        return false;
+    case ScrollElasticityAllowed:
         return true;
-
+    }
+
+    ASSERT_NOT_REACHED();
     return false;
 }
@@ -877 +909 @@
     else
         deltaY = 0;
-    
+
     bool isVerticallyStretched = false;
     bool isHorizontallyStretched = false;