Index: third_party/WebKit/Source/web/WebViewImpl.h |
diff --git a/third_party/WebKit/Source/web/WebViewImpl.h b/third_party/WebKit/Source/web/WebViewImpl.h |
index 9ee661331aaccfb70c79d3355e6beb796ccbc5b6..c8dfebd785015286a412da3cc3a6dd3a8050dbef 100644 |
--- a/third_party/WebKit/Source/web/WebViewImpl.h |
+++ b/third_party/WebKit/Source/web/WebViewImpl.h |
@@ -33,12 +33,12 @@ |
#include "core/page/ContextMenuProvider.h" |
#include "core/page/EventWithHitTestResults.h" |
+#include "platform/animation/CompositorAnimationTimeline.h" |
#include "platform/geometry/IntPoint.h" |
#include "platform/geometry/IntRect.h" |
#include "platform/graphics/GraphicsLayer.h" |
#include "platform/graphics/compositing/PaintArtifactCompositor.h" |
#include "platform/heap/Handle.h" |
-#include "public/platform/WebCompositorAnimationTimeline.h" |
#include "public/platform/WebDisplayMode.h" |
#include "public/platform/WebFloatSize.h" |
#include "public/platform/WebGestureCurveTarget.h" |
@@ -441,9 +441,9 @@ public: |
PaintLayerCompositor* compositor() const; |
void registerForAnimations(WebLayer*); |
void scheduleAnimation(); |
- void attachCompositorAnimationTimeline(WebCompositorAnimationTimeline*); |
- void detachCompositorAnimationTimeline(WebCompositorAnimationTimeline*); |
- WebCompositorAnimationTimeline* linkHighlightsTimeline() const { return m_linkHighlightsTimeline.get(); } |
+ void attachCompositorAnimationTimeline(CompositorAnimationTimeline*); |
+ void detachCompositorAnimationTimeline(CompositorAnimationTimeline*); |
+ CompositorAnimationTimeline* linkHighlightsTimeline() const { return m_linkHighlightsTimeline.get(); } |
void setVisibilityState(WebPageVisibilityState, bool) override; |
@@ -748,7 +748,7 @@ private: |
int m_flingModifier; |
WebGestureDevice m_flingSourceDevice; |
Vector<OwnPtr<LinkHighlightImpl>> m_linkHighlights; |
- OwnPtr<WebCompositorAnimationTimeline> m_linkHighlightsTimeline; |
+ OwnPtr<CompositorAnimationTimeline> m_linkHighlightsTimeline; |
OwnPtrWillBePersistent<FullscreenController> m_fullscreenController; |
bool m_showFPSCounter; |