Title: [209071] trunk/Source/WebCore
- Revision
- 209071
- Author
- [email protected]
- Date
- 2016-11-29 08:58:52 -0800 (Tue, 29 Nov 2016)
Log Message
Unreviewed, fix the build after r209070
-[ScrollingMomentumCalculatorMac calculateToReachDestination] is only available on Sierra.
* page/scrolling/mac/ScrollingMomentumCalculatorMac.mm:
(WebCore::ScrollingMomentumCalculatorMac::ensurePlatformMomentumCalculator):
* platform/spi/mac/NSScrollingMomentumCalculatorSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (209070 => 209071)
--- trunk/Source/WebCore/ChangeLog 2016-11-29 16:10:55 UTC (rev 209070)
+++ trunk/Source/WebCore/ChangeLog 2016-11-29 16:58:52 UTC (rev 209071)
@@ -1,5 +1,15 @@
2016-11-29 Wenson Hsieh <[email protected]>
+ Unreviewed, fix the build after r209070
+
+ -[ScrollingMomentumCalculatorMac calculateToReachDestination] is only available on Sierra.
+
+ * page/scrolling/mac/ScrollingMomentumCalculatorMac.mm:
+ (WebCore::ScrollingMomentumCalculatorMac::ensurePlatformMomentumCalculator):
+ * platform/spi/mac/NSScrollingMomentumCalculatorSPI.h:
+
+2016-11-28 Wenson Hsieh <[email protected]>
+
Scroll snapping on Mac should use AppKit animations
https://bugs.webkit.org/show_bug.cgi?id=147261
<rdar://problem/29395293>
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingMomentumCalculatorMac.mm (209070 => 209071)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingMomentumCalculatorMac.mm 2016-11-29 16:10:55 UTC (rev 209070)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingMomentumCalculatorMac.mm 2016-11-29 16:58:52 UTC (rev 209071)
@@ -61,7 +61,9 @@
NSRect contentFrame = NSMakeRect(0, 0, m_contentSize.width(), m_contentSize.height());
m_platformMomentumCalculator = adoptNS([[_NSScrollingMomentumCalculator alloc] initWithInitialOrigin:origin velocity:m_initialVelocity documentFrame:contentFrame constrainedClippingOrigin:NSZeroPoint clippingSize:m_viewportSize tolerance:NSMakeSize(1, 1)]);
[m_platformMomentumCalculator setDestinationOrigin:NSMakePoint(m_targetScrollOffset.width(), m_targetScrollOffset.height())];
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
[m_platformMomentumCalculator calculateToReachDestination];
+#endif
return m_platformMomentumCalculator.get();
}
Modified: trunk/Source/WebCore/platform/spi/mac/NSScrollingMomentumCalculatorSPI.h (209070 => 209071)
--- trunk/Source/WebCore/platform/spi/mac/NSScrollingMomentumCalculatorSPI.h 2016-11-29 16:10:55 UTC (rev 209070)
+++ trunk/Source/WebCore/platform/spi/mac/NSScrollingMomentumCalculatorSPI.h 2016-11-29 16:58:52 UTC (rev 209071)
@@ -35,6 +35,9 @@
- (instancetype)initWithInitialOrigin:(NSPoint)origin velocity:(NSPoint)velocity documentFrame:(NSRect)docFrame constrainedClippingOrigin:(NSPoint)constrainedClippingOrigin clippingSize:(NSSize)clipViewSize tolerance:(NSSize)tolerance;
- (NSPoint)positionAfterDuration:(NSTimeInterval)duration;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+- (void)calculateToReachDestination;
+#endif
@property (atomic) NSPoint destinationOrigin;
@property (readonly) NSTimeInterval durationUntilStop;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes