Title: [107285] trunk/Source/WebCore
- Revision
- 107285
- Author
- [email protected]
- Date
- 2012-02-09 13:31:33 -0800 (Thu, 09 Feb 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107284 => 107285)
--- trunk/Source/WebCore/ChangeLog 2012-02-09 21:26:34 UTC (rev 107284)
+++ trunk/Source/WebCore/ChangeLog 2012-02-09 21:31:33 UTC (rev 107285)
@@ -1,3 +1,29 @@
+2012-02-09 Anders Carlsson <[email protected]>
+
+ 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):
+
2012-02-09 Adrienne Walker <[email protected]>
[chromium] Correct potential double reserveTextures() in CCLayerTreeHost
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.h (107284 => 107285)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.h 2012-02-09 21:26:34 UTC (rev 107284)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.h 2012-02-09 21:31:33 UTC (rev 107285)
@@ -28,6 +28,7 @@
#if ENABLE(THREADED_SCROLLING)
+#include "ScrollElasticityController.h"
#include "ScrollingTreeNode.h"
#include <wtf/RetainPtr.h>
@@ -35,14 +36,29 @@
namespace WebCore {
-class ScrollingTreeNodeMac : public ScrollingTreeNode {
+class ScrollingTreeNodeMac : public ScrollingTreeNode, private ScrollElasticityControllerClient {
public:
explicit ScrollingTreeNodeMac(ScrollingTree*);
private:
+ // ScrollingTreeNode member functions.
virtual void update(ScrollingTreeState*) OVERRIDE;
virtual void handleWheelEvent(const PlatformWheelEvent&) OVERRIDE;
+ // ScrollElasticityController member functions.
+ virtual bool allowsHorizontalStretching() OVERRIDE;
+ virtual bool allowsVerticalStretching() OVERRIDE;
+ virtual IntSize stretchAmount() OVERRIDE;
+ virtual bool pinnedInDirection(const FloatSize&) OVERRIDE;
+ virtual bool canScrollHorizontally() OVERRIDE;
+ virtual bool canScrollVertically() OVERRIDE;
+ virtual bool shouldRubberBandInDirection(ScrollDirection) OVERRIDE;
+ virtual IntPoint absoluteScrollPosition() OVERRIDE;
+ virtual void immediateScrollBy(const FloatSize&) OVERRIDE;
+ virtual void immediateScrollByWithoutContentEdgeConstraints(const FloatSize&) OVERRIDE;
+ virtual void startSnapRubberbandTimer() OVERRIDE;
+ virtual void stopSnapRubberbandTimer() OVERRIDE;
+
IntPoint scrollPosition() const;
void setScrollPosition(const IntPoint&);
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.mm (107284 => 107285)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.mm 2012-02-09 21:26:34 UTC (rev 107284)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.mm 2012-02-09 21:31:33 UTC (rev 107285)
@@ -58,6 +58,74 @@
scrollBy(IntSize(-wheelEvent.deltaX(), -wheelEvent.deltaY()));
}
+bool ScrollingTreeNodeMac::allowsHorizontalStretching()
+{
+ // FIXME: Implement.
+ return false;
+}
+
+bool ScrollingTreeNodeMac::allowsVerticalStretching()
+{
+ // FIXME: Implement.
+ return false;
+}
+
+IntSize ScrollingTreeNodeMac::stretchAmount()
+{
+ // FIXME: Implement.
+ return IntSize();
+}
+
+bool ScrollingTreeNodeMac::pinnedInDirection(const FloatSize&)
+{
+ // FIXME: Implement.
+ return false;
+}
+
+bool ScrollingTreeNodeMac::canScrollHorizontally()
+{
+ // FIXME: Implement.
+ return false;
+}
+
+bool ScrollingTreeNodeMac::canScrollVertically()
+{
+ // FIXME: Implement.
+ return false;
+}
+
+bool ScrollingTreeNodeMac::shouldRubberBandInDirection(ScrollDirection)
+{
+ // FIXME: Implement.
+ return false;
+}
+
+IntPoint ScrollingTreeNodeMac::absoluteScrollPosition()
+{
+ // FIXME: Implement.
+ return IntPoint();
+}
+
+void ScrollingTreeNodeMac::immediateScrollBy(const FloatSize&)
+{
+ // FIXME: Implement.
+}
+
+void ScrollingTreeNodeMac::immediateScrollByWithoutContentEdgeConstraints(const FloatSize&)
+{
+ // FIXME: Implement.
+}
+
+void ScrollingTreeNodeMac::startSnapRubberbandTimer()
+{
+ // FIXME: Implement.
+}
+
+void ScrollingTreeNodeMac::stopSnapRubberbandTimer()
+{
+ // FIXME: Implement.
+}
+
IntPoint ScrollingTreeNodeMac::scrollPosition() const
{
CGPoint scrollLayerPosition = m_scrollLayer.get().position;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
