Merge 67052 - Not reviewed, layout test fix....

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 25 matching lines @@
 
 namespace WebCore {
 
 #if !OS(WINDOWS)
 ScrollAnimator* ScrollAnimator::create(ScrollbarClient* client)
 {
     return new ScrollAnimator(client);
 }
 #endif
 
+ScrollAnimator::ScrollAnimator(ScrollbarClient* client)
+    : m_client(client)
+    , m_currentPosX(0)
+    , m_currentPosY(0)
+{
+}
+
+ScrollAnimator::~ScrollAnimator()
+{
+}
+
 bool ScrollAnimator::scroll(ScrollbarOrientation orientation, ScrollGranularity, float step, float multiplier)
 {
     float* currentPos = (orientation == HorizontalScrollbar) ? &m_currentPosX : &m_currentPosY;
     float newPos = std::max(std::min(*currentPos + (step * multiplier), static_cast<float>(m_client->scrollSize(orientation))), 0.0f);
     if (*currentPos == newPos)
         return false;
     *currentPos = newPos;
     m_client->setScrollOffsetFromAnimation(IntPoint(m_currentPosX, m_currentPosY));
     return true;
 }
 
 void ScrollAnimator::setScrollPositionAndStopAnimation(ScrollbarOrientation orientation, float pos)
 {
     if (orientation == HorizontalScrollbar)
         m_currentPosX = pos;
     else
         m_currentPosY = pos;
 }
 
 } // namespace WebCore