Unreviewed, fix build after r188860
authorwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Aug 2015 17:13:06 +0000 (17:13 +0000)
committerwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Aug 2015 17:13:06 +0000 (17:13 +0000)
* page/mac/WheelEventDeltaFilterMac.mm:
(WebCore::WheelEventDeltaFilterMac::updateFromDelta): Convert argument explicitly to an NSPoint.

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

Source/WebCore/ChangeLog
Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm

index a2af9e41d457485e636453709cd500716aeed677..ff98beaca9e5ce11ede5030564538d3f590a7486 100644 (file)
@@ -1,3 +1,10 @@
+2015-08-24  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Unreviewed, fix build after r188860
+
+        * page/mac/WheelEventDeltaFilterMac.mm:
+        (WebCore::WheelEventDeltaFilterMac::updateFromDelta): Convert argument explicitly to an NSPoint.
+
 2015-08-24  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         Use _NSScrollingPredominantAxisFilter for wheel event filtering on Mac
index 4ef086f27d97721ebe46e5baa67a5e996deda2bf..1d1f5ed8b2dbba9841fc0906ef0afb2bb8be7c2d 100644 (file)
@@ -27,6 +27,7 @@
 
 #include "config.h"
 #include "WheelEventDeltaFilterMac.h"
+#include "FloatPoint.h"
 
 #import "NSScrollingInputFilterSPI.h"
 #import <wtf/CurrentTime.h>
@@ -52,7 +53,7 @@ void WheelEventDeltaFilterMac::updateFromDelta(const FloatSize& delta)
 
     NSPoint filteredDeltaResult;
     NSPoint filteredVelocityResult;
-    [m_predominantAxisFilter filterInputDelta:CGPointMake(delta.width(), delta.height()) timestamp:monotonicallyIncreasingTime() - m_beginFilteringDeltasTime outputDelta:&filteredDeltaResult velocity:&filteredVelocityResult];
+    [m_predominantAxisFilter filterInputDelta:NSPoint(FloatPoint(delta.width(), delta.height())) timestamp:monotonicallyIncreasingTime() - m_beginFilteringDeltasTime outputDelta:&filteredDeltaResult velocity:&filteredVelocityResult];
     m_currentFilteredDelta = FloatSize(filteredDeltaResult.x, filteredDeltaResult.y);
 }