| Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| index 49b5b392f43c2d0748b44c0ed854ead514fdb60d..3003059b472b51c9cc6629a895b9c57dd541f7f4 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| @@ -47,7 +47,7 @@ class PlatformWheelEvent;
|
| class ProgrammaticScrollAnimator;
|
| struct ScrollAlignment;
|
| class ScrollAnimatorBase;
|
| -class WebCompositorAnimationTimeline;
|
| +class CompositorAnimationTimeline;
|
| class Widget;
|
|
|
| enum ScrollBehavior {
|
| @@ -245,7 +245,7 @@ public:
|
| bool hasLayerForVerticalScrollbar() const;
|
| bool hasLayerForScrollCorner() const;
|
|
|
| - void layerForScrollingDidChange(WebCompositorAnimationTimeline*);
|
| + void layerForScrollingDidChange(CompositorAnimationTimeline*);
|
|
|
| void cancelScrollAnimation();
|
| virtual void cancelProgrammaticScrollAnimation();
|
|
|