Chromium Code Reviews| Index: third_party/WebKit/Source/core/frame/FrameView.cpp |
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp |
| index ef885999641b7b495cfeecfa715fe3f8412150dd..964b6a0cdf1661894e945a0c60b33ae35dca389b 100644 |
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
| @@ -434,6 +434,12 @@ ScrollingCoordinator* FrameView::scrollingCoordinator() const |
| return p ? p->scrollingCoordinator() : 0; |
| } |
| +CompositorAnimationTimeline* FrameView::compositorAnimationTimeline() const |
| +{ |
| + ScrollingCoordinator* c = scrollingCoordinator(); |
| + return c ? c->compositorAnimationTimeline() : 0; |
|
jbroman
2016/03/14 17:35:32
Prefer nullptr to 0.
ymalik
2016/03/14 21:45:39
Done.
|
| +} |
| + |
| void FrameView::setCanHaveScrollbars(bool canHaveScrollbars) |
| { |
| m_canHaveScrollbars = canHaveScrollbars; |