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

Unified Diff: cc/CCLayerTreeHostImpl.h

Issue 10917153: Update cc snapshot to r127918 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | « cc/CCLayerTreeHostClient.h ('k') | cc/CCLayerTreeHostImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCLayerTreeHostImpl.h
diff --git a/cc/CCLayerTreeHostImpl.h b/cc/CCLayerTreeHostImpl.h
index 4061d11fd162b4757b9135fa831ca311ac7ded9d..177f46fa4a60fedec802b565c9601f7bb598edb2 100644
--- a/cc/CCLayerTreeHostImpl.h
+++ b/cc/CCLayerTreeHostImpl.h
@@ -18,7 +18,6 @@
namespace WebCore {
-class CCActiveGestureAnimation;
class CCCompletionEvent;
class CCDebugRectHistory;
class CCFrameRateCounter;
@@ -62,9 +61,6 @@ public:
virtual void pinchGestureUpdate(float, const IntPoint&) OVERRIDE;
virtual void pinchGestureEnd() OVERRIDE;
virtual void startPageScaleAnimation(const IntSize& targetPosition, bool anchorPoint, float pageScale, double startTime, double duration) OVERRIDE;
- virtual CCActiveGestureAnimation* activeGestureAnimation() OVERRIDE { return m_activeGestureAnimation.get(); }
- // To clear an active animation, pass nullptr.
- virtual void setActiveGestureAnimation(PassOwnPtr<CCActiveGestureAnimation>) OVERRIDE;
virtual void scheduleAnimation() OVERRIDE;
struct FrameData : public CCRenderPassSink {
@@ -208,7 +204,6 @@ protected:
CCLayerTreeHostImpl(const CCLayerTreeSettings&, CCLayerTreeHostImplClient*);
void animatePageScale(double monotonicTime);
- void animateGestures(double monotonicTime);
void animateScrollbars(double monotonicTime);
// Exposed for testing.
@@ -280,7 +275,6 @@ private:
IntPoint m_previousPinchAnchor;
OwnPtr<CCPageScaleAnimation> m_pageScaleAnimation;
- OwnPtr<CCActiveGestureAnimation> m_activeGestureAnimation;
// This is used for ticking animations slowly when hidden.
OwnPtr<CCLayerTreeHostImplTimeSourceAdapter> m_timeSourceClientAdapter;
« no previous file with comments | « cc/CCLayerTreeHostClient.h ('k') | cc/CCLayerTreeHostImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698