| Index: Source/core/platform/mac/ScrollAnimatorMac.h
|
| diff --git a/Source/core/platform/mac/ScrollAnimatorMac.h b/Source/core/platform/mac/ScrollAnimatorMac.h
|
| index 648d445085d747ba998db43599a94cccd2656f8e..4d03966b7fffaeb842b08637d88dcce84bec95e7 100644
|
| --- a/Source/core/platform/mac/ScrollAnimatorMac.h
|
| +++ b/Source/core/platform/mac/ScrollAnimatorMac.h
|
| @@ -40,7 +40,7 @@ OBJC_CLASS WebScrollbarPainterDelegate;
|
|
|
| typedef id ScrollbarPainterController;
|
|
|
| -#if !ENABLE(RUBBER_BANDING)
|
| +#if !USE(RUBBER_BANDING)
|
| class ScrollElasticityControllerClient { };
|
| #endif
|
|
|
| @@ -88,7 +88,7 @@ private:
|
| virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, float multiplier);
|
| virtual void scrollToOffsetWithoutAnimation(const FloatPoint&);
|
|
|
| -#if ENABLE(RUBBER_BANDING)
|
| +#if USE(RUBBER_BANDING)
|
| virtual bool handleWheelEvent(const PlatformWheelEvent&) OVERRIDE;
|
| #endif
|
|
|
| @@ -130,7 +130,7 @@ private:
|
|
|
| virtual bool isRubberBandInProgress() const OVERRIDE;
|
|
|
| -#if ENABLE(RUBBER_BANDING)
|
| +#if USE(RUBBER_BANDING)
|
| /// ScrollElasticityControllerClient member functions.
|
| virtual IntSize stretchAmount() OVERRIDE;
|
| virtual bool allowsHorizontalStretching() OVERRIDE;
|
|
|