| 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 4b6a376638ab0a609520c227301a0a1eed5f6bbe..feec7cf705d5c961b718fdefa09c7a98210a7b32 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&);
|
|
|