Index: public/web/WebInputEvent.h |
diff --git a/public/web/WebInputEvent.h b/public/web/WebInputEvent.h |
index ab7e4aba73b7186d8a9a70ec2efc8ebdd5da7618..172a5bd317f14cbb41d9921a18f44edacbfb3a3f 100644 |
--- a/public/web/WebInputEvent.h |
+++ b/public/web/WebInputEvent.h |
@@ -362,6 +362,13 @@ public: |
Phase momentumPhase; |
// See comment at the top of the file for why an int is used here. |
Rick Byers
2014/11/27 15:55:15
Majid is just about to land his CL using bools (ht
lanwei
2014/12/02 06:28:22
I will update when I can pull the new changes from
Rick Byers
2014/12/02 15:48:20
I talked with Majid. His CL might still be a coup
|
+ // When Ctrl key is pressed, for scrolling on touch pad on ChromeOS or all |
+ // scrolling on MACOS, we set suppressScroll to be false, which means always |
tdresser
2014/11/27 15:06:06
For consistency with other code, use "Mac OS"
lanwei
2014/12/02 06:28:22
Done.
|
+ // scrolling, for all other scrolling, we set it true, disabling all scrolling |
tdresser
2014/11/27 15:06:06
I find this comment hard to read.
Can you try rewo
Rick Byers
2014/11/27 15:55:15
How about something like this (remember blink and
lanwei
2014/12/02 06:28:22
Done.
lanwei
2014/12/02 06:28:22
Done.
|
+ // for this wheel event. |
+ int suppressScroll; |
+ |
+ // See comment at the top of the file for why an int is used here. |
// Rubberbanding is an OSX visual effect. When a user scrolls the content |
// area with a track pad, and the content area is already at its limit in |
// the direction being scrolled, the entire content area is allowed to |
@@ -391,6 +398,7 @@ public: |
, hasPreciseScrollingDeltas(false) |
, phase(PhaseNone) |
, momentumPhase(PhaseNone) |
+ , suppressScroll(false) |
, canRubberbandLeft(true) |
, canRubberbandRight(true) |
{ |