Merge 67401 - 210-09-13 Darin Fisher <darin@chromium.org>...

WebCore/platform/ScrollAnimatorWin.h

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ScrollAnimatorWin_h
 #define ScrollAnimatorWin_h
 
+#if ENABLE(SMOOTH_SCROLLING)
+
 #include "ScrollAnimator.h"
 #include "Timer.h"
 
 namespace WebCore {
 
 class ScrollAnimatorWin : public ScrollAnimator {
 public:
     ScrollAnimatorWin(ScrollbarClient*);
     virtual ~ScrollAnimatorWin();
 
@@ skipping 17 matching lines @@
 
     void animationTimerFired(Timer<ScrollAnimatorWin>*);
     void stopAnimationTimerIfNeeded(PerAxisData*);
     void animateScroll(PerAxisData*);
 
     PerAxisData m_horizontalData;
     PerAxisData m_verticalData;
 };
 
 }
+
+#endif // ENABLE(SMOOTH_SCROLLING)
+
 #endif