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

WebCore/platform/ScrollAnimator.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 23 matching lines @@
 #include "ScrollTypes.h"
 
 namespace WebCore {
 
 class ScrollbarClient;
 
 class ScrollAnimator {
 public:
     static ScrollAnimator* create(ScrollbarClient*);
 
-    ScrollAnimator(ScrollbarClient* client) : m_client(client) { }
-    virtual ~ScrollAnimator() { }
+    ScrollAnimator(ScrollbarClient* client);
+    virtual ~ScrollAnimator();
 
     // Computes a scroll destination for the given parameters.  Returns false if
     // already at the destination.  Otherwise, starts scrolling towards the
     // destination and returns true.  Scrolling may be immediate or animated.
     // The base class implementation always scrolls immediately, never animates.
     virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, float multiplier);
 
     // Stops any animation in the given direction and updates the ScrollAnimator
     // with the current scroll position.  This does not cause a callback to the
     // ScrollbarClient.
     virtual void setScrollPositionAndStopAnimation(ScrollbarOrientation, float);
 
 protected:
     ScrollbarClient* m_client;
     float m_currentPosX; // We avoid using a FloatPoint in order to reduce
     float m_currentPosY; // subclass code complexity.
 };
 
 } // namespace WebCore
 #endif