src/java.desktop/macosx/classes/sun/lwawt/macosx/NSEvent.java

*** 30,49 ****
--- 30,55 ----
  /**
   * A class representing Cocoa NSEvent class with the fields only necessary for
   * JDK functionality.
   */
  final class NSEvent {
+ 
+     static final int SCROLL_MASK_WHEEL = 1;
+     static final int SCROLL_MASK_TRACKPAD = 1 << 1;
+     static final int SCROLL_MASK_PHASE_BEGAN = 1 << 2;
+ 
      private int type;
      private int modifierFlags;
  
      // Mouse event information
      private int clickCount;
      private int buttonNumber;
      private int x;
      private int y;
      private double scrollDeltaY;
      private double scrollDeltaX;
+     private int scrollMask;
      private int absX;
      private int absY;
  
      // Key event information
      private short keyCode;
*** 60,80 ****
      }
  
      // Called from native
      NSEvent(int type, int modifierFlags, int clickCount, int buttonNumber,
                     int x, int y, int absX, int absY,
!                    double scrollDeltaY, double scrollDeltaX) {
          this.type = type;
          this.modifierFlags = modifierFlags;
          this.clickCount = clickCount;
          this.buttonNumber = buttonNumber;
          this.x = x;
          this.y = y;
          this.absX = absX;
          this.absY = absY;
          this.scrollDeltaY = scrollDeltaY;
          this.scrollDeltaX = scrollDeltaX;
      }
  
      int getType() {
          return type;
      }
--- 66,87 ----
      }
  
      // Called from native
      NSEvent(int type, int modifierFlags, int clickCount, int buttonNumber,
                     int x, int y, int absX, int absY,
!                    double scrollDeltaY, double scrollDeltaX, int scrollMask) {
          this.type = type;
          this.modifierFlags = modifierFlags;
          this.clickCount = clickCount;
          this.buttonNumber = buttonNumber;
          this.x = x;
          this.y = y;
          this.absX = absX;
          this.absY = absY;
          this.scrollDeltaY = scrollDeltaY;
          this.scrollDeltaX = scrollDeltaX;
+         this.scrollMask = scrollMask;
      }
  
      int getType() {
          return type;
      }
*** 105,114 ****
--- 112,125 ----
  
      double getScrollDeltaX() {
          return scrollDeltaX;
      }
  
+     int getScrollMask() {
+         return scrollMask;
+     }
+ 
      int getAbsX() {
          return absX;
      }
  
      int getAbsY() {