| Index: third_party/WebKit/Source/core/layout/LayoutBox.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.h b/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| index 8f347d259b9eba887c8c4116496b848a8287be9b..5573d89aad297a4eddcd1b2bb2706773e3a60332 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.h
|
| @@ -691,7 +691,7 @@ public:
|
| int intrinsicScrollbarLogicalWidth() const;
|
| int scrollbarLogicalWidth() const { return style()->isHorizontalWritingMode() ? verticalScrollbarWidth() : horizontalScrollbarHeight(); }
|
| int scrollbarLogicalHeight() const { return style()->isHorizontalWritingMode() ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }
|
| - virtual ScrollResultOneDimensional scroll(ScrollDirectionPhysical, ScrollGranularity, float delta = 1);
|
| + virtual ScrollResult scroll(ScrollGranularity, const FloatSize&);
|
| bool canBeScrolledAndHasScrollableArea() const;
|
| virtual bool canBeProgramaticallyScrolled() const;
|
| virtual void autoscroll(const IntPoint&);
|
|
|