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

WebCore/platform/ScrollAnimator.cpp

 /*
  * 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 18 matching lines @@
  */
 
 #include "config.h"
 #include "ScrollAnimator.h"
 
 #include "ScrollbarClient.h"
 #include <algorithm>
 
 namespace WebCore {
 
-#if !OS(WINDOWS)
+#if !ENABLE(SMOOTH_SCROLLING)
 ScrollAnimator* ScrollAnimator::create(ScrollbarClient* client)
 {
     return new ScrollAnimator(client);
 }
 #endif
 
 ScrollAnimator::ScrollAnimator(ScrollbarClient* client)
     : m_client(client)
     , m_currentPosX(0)
     , m_currentPosY(0)
@@ skipping 17 matching lines @@
 
 void ScrollAnimator::setScrollPositionAndStopAnimation(ScrollbarOrientation orientation, float pos)
 {
     if (orientation == HorizontalScrollbar)
         m_currentPosX = pos;
     else
         m_currentPosY = pos;
 }
 
 } // namespace WebCore