Merge 67018 - Not reviewed, build fix....

WebKit/win/WebScrollBar.h

 /*
  * Copyright (C) 2007 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 98 matching lines @@
         /* [in] */ WPARAM wParam,
         /* [in] */ LPARAM lParam);
     
     virtual HRESULT STDMETHODCALLTYPE scroll( 
         /* [in] */ WebScrollDirection direction,
         /* [in] */ WebScrollGranularity granularity,
         /* [in] */ float multiplier);
 
 protected:
     // ScrollbarClient
+    virtual int scrollSize(ScrollbarOrientation orientation) const;
+    virtual void setScrollOffsetFromAnimation(const IntPoint&);
     virtual void valueChanged(Scrollbar*);
     virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&);
 
     // FIXME: We should provide a way to set this value.
     virtual bool isActive() const { return true; }
 
     virtual bool scrollbarCornerPresent() const { return false; }
 
     ULONG m_refCount;
     HWND m_containingWindow;
     RefPtr<WebCore::Scrollbar> m_scrollBar;
     COMPtr<IWebScrollBarDelegatePrivate> m_delegate;
 };
 
 #endif