⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 107285 in webkit


Ignore:
Timestamp:
Feb 9, 2012, 1:31:33 PM (15 years ago)
Author:
andersca@apple.com
Message:

ScrollingTreeNodeMac should implement ScrollElasticityController
​https://bugs.webkit.org/show_bug.cgi?id=78277

Reviewed by Andreas Kling.

Add stubbed out implementations of the ScrollElasticityController member functions.

  • page/scrolling/mac/ScrollingTreeNodeMac.h:

(ScrollingTreeNodeMac):

  • page/scrolling/mac/ScrollingTreeNodeMac.mm:

(WebCore::ScrollingTreeNodeMac::allowsHorizontalStretching):
(WebCore):
(WebCore::ScrollingTreeNodeMac::allowsVerticalStretching):
(WebCore::ScrollingTreeNodeMac::stretchAmount):
(WebCore::ScrollingTreeNodeMac::pinnedInDirection):
(WebCore::ScrollingTreeNodeMac::canScrollHorizontally):
(WebCore::ScrollingTreeNodeMac::canScrollVertically):
(WebCore::ScrollingTreeNodeMac::shouldRubberBandInDirection):
(WebCore::ScrollingTreeNodeMac::absoluteScrollPosition):
(WebCore::ScrollingTreeNodeMac::immediateScrollBy):
(WebCore::ScrollingTreeNodeMac::immediateScrollByWithoutContentEdgeConstraints):
(WebCore::ScrollingTreeNodeMac::startSnapRubberbandTimer):
(WebCore::ScrollingTreeNodeMac::stopSnapRubberbandTimer):

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r107282 r107285  
     12012-02-09  Anders Carlsson  <andersca@apple.com>
     2
     3        ScrollingTreeNodeMac should implement ScrollElasticityController
     4        https://bugs.webkit.org/show_bug.cgi?id=78277
     5
     6        Reviewed by Andreas Kling.
     7
     8        Add stubbed out implementations of the ScrollElasticityController member functions.
     9
     10        * page/scrolling/mac/ScrollingTreeNodeMac.h:
     11        (ScrollingTreeNodeMac):
     12        * page/scrolling/mac/ScrollingTreeNodeMac.mm:
     13        (WebCore::ScrollingTreeNodeMac::allowsHorizontalStretching):
     14        (WebCore):
     15        (WebCore::ScrollingTreeNodeMac::allowsVerticalStretching):
     16        (WebCore::ScrollingTreeNodeMac::stretchAmount):
     17        (WebCore::ScrollingTreeNodeMac::pinnedInDirection):
     18        (WebCore::ScrollingTreeNodeMac::canScrollHorizontally):
     19        (WebCore::ScrollingTreeNodeMac::canScrollVertically):
     20        (WebCore::ScrollingTreeNodeMac::shouldRubberBandInDirection):
     21        (WebCore::ScrollingTreeNodeMac::absoluteScrollPosition):
     22        (WebCore::ScrollingTreeNodeMac::immediateScrollBy):
     23        (WebCore::ScrollingTreeNodeMac::immediateScrollByWithoutContentEdgeConstraints):
     24        (WebCore::ScrollingTreeNodeMac::startSnapRubberbandTimer):
     25        (WebCore::ScrollingTreeNodeMac::stopSnapRubberbandTimer):
     26
    1272012-02-09  Adrienne Walker  <enne@google.com>
    228

  • trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.h

    r106720 r107285  
    2929#if ENABLE(THREADED_SCROLLING)
    3030
     31#include "ScrollElasticityController.h"
    3132#include "ScrollingTreeNode.h"
    3233#include <wtf/RetainPtr.h>
    … …  
    3637namespace WebCore {
    3738
    38 class ScrollingTreeNodeMac : public ScrollingTreeNode {
     39class ScrollingTreeNodeMac : public ScrollingTreeNode, private ScrollElasticityControllerClient {
    3940public:
    4041    explicit ScrollingTreeNodeMac(ScrollingTree*);
    4142
    4243private:
     44    // ScrollingTreeNode member functions.
    4345    virtual void update(ScrollingTreeState*) OVERRIDE;
    4446    virtual void handleWheelEvent(const PlatformWheelEvent&) OVERRIDE;
     47
     48    // ScrollElasticityController member functions.
     49    virtual bool allowsHorizontalStretching() OVERRIDE;
     50    virtual bool allowsVerticalStretching() OVERRIDE;
     51    virtual IntSize stretchAmount() OVERRIDE;
     52    virtual bool pinnedInDirection(const FloatSize&) OVERRIDE;
     53    virtual bool canScrollHorizontally() OVERRIDE;
     54    virtual bool canScrollVertically() OVERRIDE;
     55    virtual bool shouldRubberBandInDirection(ScrollDirection) OVERRIDE;
     56    virtual IntPoint absoluteScrollPosition() OVERRIDE;
     57    virtual void immediateScrollBy(const FloatSize&) OVERRIDE;
     58    virtual void immediateScrollByWithoutContentEdgeConstraints(const FloatSize&) OVERRIDE;
     59    virtual void startSnapRubberbandTimer() OVERRIDE;
     60    virtual void stopSnapRubberbandTimer() OVERRIDE;
    4561
    4662    IntPoint scrollPosition() const;

  • trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.mm

    r106750 r107285  
    5959}
    6060
     61bool ScrollingTreeNodeMac::allowsHorizontalStretching()
     62{
     63    // FIXME: Implement.
     64    return false;
     65}
     66
     67bool ScrollingTreeNodeMac::allowsVerticalStretching()
     68{
     69    // FIXME: Implement.
     70    return false;
     71}
     72
     73IntSize ScrollingTreeNodeMac::stretchAmount()
     74{
     75    // FIXME: Implement.
     76    return IntSize();
     77}
     78
     79bool ScrollingTreeNodeMac::pinnedInDirection(const FloatSize&)
     80{
     81    // FIXME: Implement.
     82    return false;
     83}
     84
     85bool ScrollingTreeNodeMac::canScrollHorizontally()
     86{
     87    // FIXME: Implement.
     88    return false;
     89}
     90
     91bool ScrollingTreeNodeMac::canScrollVertically()
     92{
     93    // FIXME: Implement.
     94    return false;
     95}
     96
     97bool ScrollingTreeNodeMac::shouldRubberBandInDirection(ScrollDirection)
     98{
     99    // FIXME: Implement.
     100    return false;
     101}
     102
     103IntPoint ScrollingTreeNodeMac::absoluteScrollPosition()
     104{
     105    // FIXME: Implement.
     106    return IntPoint();
     107}
     108
     109void ScrollingTreeNodeMac::immediateScrollBy(const FloatSize&)
     110{
     111    // FIXME: Implement.
     112}
     113
     114void ScrollingTreeNodeMac::immediateScrollByWithoutContentEdgeConstraints(const FloatSize&)
     115{
     116    // FIXME: Implement.
     117}
     118
     119void ScrollingTreeNodeMac::startSnapRubberbandTimer()
     120{
     121    // FIXME: Implement.
     122}
     123
     124void ScrollingTreeNodeMac::stopSnapRubberbandTimer()
     125{
     126    // FIXME: Implement.
     127}
     128
    61129IntPoint ScrollingTreeNodeMac::scrollPosition() const
    62130{
Note: See TracChangeset for help on using the changeset viewer.