https://trac.webkit.org/changeset/182338 introduced a build failure that I
authorbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Apr 2015 20:26:36 +0000 (20:26 +0000)
committerbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Apr 2015 20:26:36 +0000 (20:26 +0000)
attempted to fix with https://trac.webkit.org/changeset/182341 , but that disabled
the feature accidentally.  This should do the right thing.

* UIProcess/API/mac/WKView.mm:
(-[WKView pressureChangeWithEvent:]):

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

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/mac/WKView.mm

index 3539cac..88d10e4 100644 (file)
@@ -1,3 +1,12 @@
+2015-04-06  Beth Dakin  <bdakin@apple.com>
+
+        https://trac.webkit.org/changeset/182338 introduced a build failure that I 
+        attempted to fix with https://trac.webkit.org/changeset/182341 , but that disabled 
+        the feature accidentally.  This should do the right thing.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView pressureChangeWithEvent:]):
+
 2015-04-06  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r182296.
index a56dee1..4450ad4 100644 (file)
@@ -1392,12 +1392,12 @@ NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseDraggedInternal)
     [self mouseDraggedInternal:event];
 }
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101003
 - (void)pressureChangeWithEvent:(NSEvent *)event
 {
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
     _data->_page->inputDeviceForceDidChange(event.pressure, event.stage);
-}
 #endif
+}
 
 - (BOOL)acceptsFirstMouse:(NSEvent *)event
 {