Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h |
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h |
index 2fa5de6a94a271b38de631c6fcb34592d3bd30e0..0fe745fe48628fa1f91b62b165ed835895a52d85 100644 |
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h |
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h |
@@ -34,7 +34,7 @@ public: |
void dispose(); |
String runStateAsText() const; |
- void updateImplOnlyScrollOffsetAnimation(const FloatSize& adjustment); |
+ void adjustImplOnlyScrollOffsetAnimation(const FloatSize& adjustment); |
virtual bool hasRunningAnimation() const { return false; } |
@@ -139,6 +139,14 @@ protected: |
// An adjustment to the scroll offset on the main thread that may affect |
// impl-only scroll offset animations. |
FloatSize m_implOnlyAnimationAdjustment; |
+ |
+ // If set to true, sends a cc::ScrollOffsetAnimationUpdate to cc which will |
+ // abort the impl-only scroll offset animation and continue it on main |
+ // thread. |
+ bool m_implOnlyAnimationTakeover; |
+private: |
jbroman
2016/05/25 19:00:37
nit: blank line before "private:"
ymalik
2016/05/25 19:51:10
Done.
|
+ bool hasImplOnlyAnimationUpdate() const; |
+ void takeoverImplOnlyScrollOffsetAnimation(); |
jbroman
2016/05/25 19:00:37
ditto
ymalik
2016/05/25 19:51:10
Done.
|
}; |
} // namespace blink |