Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Unified Diff: Source/WebKit/chromium/tests/GraphicsLayerTest.cpp

Issue 16982005: Allow objects without scrollbars to be scrollable (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix broken Mac build Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebKit/chromium/tests/GraphicsLayerTest.cpp
diff --git a/Source/WebKit/chromium/tests/GraphicsLayerTest.cpp b/Source/WebKit/chromium/tests/GraphicsLayerTest.cpp
index 1dd113a8fb4eb67147167d76303791b7be674f90..34d8e21b1460d9327c62c601174c5dce1ea0b8d0 100644
--- a/Source/WebKit/chromium/tests/GraphicsLayerTest.cpp
+++ b/Source/WebKit/chromium/tests/GraphicsLayerTest.cpp
@@ -118,7 +118,6 @@ class FakeScrollableArea : public ScrollableArea {
public:
virtual bool isActive() const OVERRIDE { return false; }
virtual int scrollSize(ScrollbarOrientation) const OVERRIDE { return 100; }
- virtual int scrollPosition(Scrollbar*) const OVERRIDE { return 0; }
virtual bool isScrollCornerVisible() const OVERRIDE { return false; }
virtual IntRect scrollCornerRect() const OVERRIDE { return IntRect(); }
virtual int visibleWidth() const OVERRIDE { return 10; }
@@ -129,6 +128,13 @@ public:
virtual IntRect scrollableAreaBoundingBox() const OVERRIDE { return IntRect(); }
virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) OVERRIDE { }
virtual void invalidateScrollCornerRect(const IntRect&) OVERRIDE { }
+ virtual bool userInputScrollable(ScrollbarOrientation) const OVERRIDE { return true; }
+ virtual int pageStep(ScrollbarOrientation) const OVERRIDE { return 0; }
+ virtual IntPoint minimumScrollPosition() const OVERRIDE { return IntPoint(); }
+ virtual IntPoint maximumScrollPosition() const OVERRIDE
+ {
+ return IntPoint(contentsSize().width() - visibleWidth(), contentsSize().height() - visibleHeight());
+ }
virtual void setScrollOffset(const IntPoint& scrollOffset) OVERRIDE { m_scrollPosition = scrollOffset; }
virtual IntPoint scrollPosition() const OVERRIDE { return m_scrollPosition; }

Powered by Google App Engine
This is Rietveld 408576698