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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebCore/page/AutoscrollController.h

Issue 12040032: Merge 140104 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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 | « LayoutTests/platform/chromium/TestExpectations ('k') | Source/WebCore/page/AutoscrollController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/page/AutoscrollController.h
===================================================================
--- Source/WebCore/page/AutoscrollController.h (revision 140488)
+++ Source/WebCore/page/AutoscrollController.h (working copy)
@@ -42,6 +42,7 @@
NoAutoscroll,
AutoscrollForSelection,
#if ENABLE(PAN_SCROLLING)
+ AutoscrollForPanCanStop,
AutoscrollForPan,
#endif
};
@@ -76,8 +77,6 @@
AutoscrollType m_autoscrollType;
#if ENABLE(PAN_SCROLLING)
IntPoint m_panScrollStartPos;
- bool m_panScrollButtonPressed;
- bool m_springLoadedPanScrollInProgress;
#endif
};
« no previous file with comments | « LayoutTests/platform/chromium/TestExpectations ('k') | Source/WebCore/page/AutoscrollController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698