[chromium/mac] Fix two-finger scrolling

https://bugs.webkit.org/show_bug.cgi?id=77316

http://trac.webkit.org/changeset/106021/trunk changed the phase enums
to match AppKit. This changes WebMouseWheelEvent accordingly.

No tests, because DRT doesn't support synthetic scroll events with
event phases.

Patch by Nico Weber <nicolasweber@gmx.de> on 2012-01-29
Reviewed by Anders Carlsson.

* public/WebInputEvent.h:
* src/mac/WebInputEventFactory.mm:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106214 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 2fb7d6b..337c378 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2012-01-29  Nico Weber  <nicolasweber@gmx.de>
+
+        [chromium/mac] Fix two-finger scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=77316
+
+        http://trac.webkit.org/changeset/106021/trunk changed the phase enums
+        to match AppKit. This changes WebMouseWheelEvent accordingly.
+
+        No tests, because DRT doesn't support synthetic scroll events with
+        event phases.
+
+        Reviewed by Anders Carlsson.
+
+        * public/WebInputEvent.h:
+        * src/mac/WebInputEventFactory.mm:
+
 2012-01-28  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed.  Rolled DEPS.

diff --git a/Source/WebKit/chromium/public/WebInputEvent.h b/Source/WebKit/chromium/public/WebInputEvent.h
index eb34873..57b1f4b 100644 (file)
--- a/Source/WebKit/chromium/public/WebInputEvent.h
+++ b/Source/WebKit/chromium/public/WebInputEvent.h
@@ -306,11 +306,12 @@ class WebMouseWheelEvent : public WebMouseEvent {
 public:
     enum Phase {
         PhaseNone        = 0,
-        PhaseBegan       = 1 << 1,
-        PhaseStationary  = 1 << 2,
-        PhaseChanged     = 1 << 3,
-        PhaseEnded       = 1 << 4,
-        PhaseCancelled   = 1 << 5,
+        PhaseBegan       = 1 << 0,
+        PhaseStationary  = 1 << 1,
+        PhaseChanged     = 1 << 2,
+        PhaseEnded       = 1 << 3,
+        PhaseCancelled   = 1 << 4,
+        PhaseMayBegin    = 1 << 5,
     };
 
     float deltaX;

diff --git a/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm b/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm
index f84df98..f719f2d 100644 (file)
--- a/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm
+++ b/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm
@@ -43,7 +43,8 @@ enum {
     NSEventPhaseStationary  = 0x1 << 1,
     NSEventPhaseChanged     = 0x1 << 2,
     NSEventPhaseEnded       = 0x1 << 3,
-    NSEventPhaseCancelled   = 0x1 << 4
+    NSEventPhaseCancelled   = 0x1 << 4,
+    NSEventPhaseMayBegin    = 0x1 << 5
 };
 typedef NSUInteger NSEventPhase;