Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(692)

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.h

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Fix copyrights and years. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/web/WebPagePopupImpl.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « third_party/WebKit/Source/web/WebPagePopupImpl.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698