Chromium Code Reviews| Index: third_party/WebKit/Source/core/frame/VisualViewport.cpp |
| diff --git a/third_party/WebKit/Source/core/frame/VisualViewport.cpp b/third_party/WebKit/Source/core/frame/VisualViewport.cpp |
| index 36f962068c3dd39c9ee25752b4aa7b901fa75685..2eed0b2b5dc6eb08cf76ff10e1d59e9ef2ba2648 100644 |
| --- a/third_party/WebKit/Source/core/frame/VisualViewport.cpp |
| +++ b/third_party/WebKit/Source/core/frame/VisualViewport.cpp |
| @@ -721,6 +721,12 @@ bool VisualViewport::shouldDisableDesktopWorkarounds() const |
| || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1); |
| } |
| +CompositorAnimationTimeline* VisualViewport::compositorAnimationTimeline() const |
| +{ |
| + ScrollingCoordinator* c = frameHost().page().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.
|
| +} |
| + |
| String VisualViewport::debugName(const GraphicsLayer* graphicsLayer) const |
| { |
| String name; |