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

Unified Diff: Source/platform/scroll/Scrollbar.h

Issue 246293006: Blink Support for Overlay Scrollbar Animation Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix unittest and move unittest to blink_platform_unittests Created 6 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 | « Source/platform/scroll/ScrollableArea.cpp ('k') | Source/platform/scroll/Scrollbar.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/scroll/Scrollbar.h
diff --git a/Source/platform/scroll/Scrollbar.h b/Source/platform/scroll/Scrollbar.h
index 0db0d3740f22d38c420e04dde9205b4dde88654a..aefdf7d62c54a311fd174379b4a569f1eb7e585e 100644
--- a/Source/platform/scroll/Scrollbar.h
+++ b/Source/platform/scroll/Scrollbar.h
@@ -30,6 +30,7 @@
#include "platform/Widget.h"
#include "platform/scroll/ScrollTypes.h"
#include "platform/scroll/ScrollbarThemeClient.h"
+#include "public/platform/WebThemeEngine.h"
#include "wtf/MathExtras.h"
#include "wtf/PassRefPtr.h"
@@ -101,6 +102,8 @@ public:
// Called by the ScrollableArea when the scroll offset changes.
void offsetDidChange();
+ void updateStateTransitionData(blink::WebThemeEngine::State, blink::WebThemeEngine::State, double);
+
void disconnectFromScrollableArea() { m_scrollableArea = 0; }
ScrollableArea* scrollableArea() const { return m_scrollableArea; }
@@ -117,6 +120,11 @@ public:
virtual bool isOverlayScrollbar() const OVERRIDE;
bool shouldParticipateInHitTesting();
+ virtual bool isDuringStateTransitionAnimation() const OVERRIDE;
+ virtual double stateTransitionProgress() const OVERRIDE;
+ virtual blink::WebThemeEngine::State stateTransitionStartState() const OVERRIDE;
+ virtual blink::WebThemeEngine::State stateTransitionEndState() const OVERRIDE;
+
bool isWindowActive() const;
bool gestureEvent(const PlatformGestureEvent&);
@@ -190,6 +198,10 @@ protected:
bool m_isAlphaLocked;
+ double m_stateTransitionProgress;
+ blink::WebThemeEngine::State m_startState;
+ blink::WebThemeEngine::State m_endState;
+
private:
virtual bool isScrollbar() const OVERRIDE { return true; }
« no previous file with comments | « Source/platform/scroll/ScrollableArea.cpp ('k') | Source/platform/scroll/Scrollbar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698