Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>...

WebCore/platform/Scrollbar.h

 /*
  * Copyright (C) 2004, 2006 Apple Computer, 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 24 matching lines @@
 namespace WebCore {
 
 class GraphicsContext;
 class IntRect;
 class ScrollbarClient;
 class ScrollbarTheme;
 class PlatformMouseEvent;
 
 class Scrollbar : public Widget {
 public:
+    enum ScrollSource {
+        FromScrollAnimator,
+        NotFromScrollAnimator,
+    };
+
     virtual ~Scrollbar();
 
     // Must be implemented by platforms that can't simply use the Scrollbar base class.  Right now the only platform that is not using the base class is GTK.
     static PassRefPtr<Scrollbar> createNativeScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, ScrollbarControlSize size);
 
     static int pixelsPerLineStep() { return 40; }
     static float minFractionToStepWhenPaging() { return 0.875f; }
     static int maxOverlapBetweenPages();
 
     void setClient(ScrollbarClient* client) { m_client = client; }
@@ skipping 13 matching lines @@
     int lineStep() const { return m_lineStep; }
     int pageStep() const { return m_pageStep; }
     float pixelStep() const { return m_pixelStep; }
     
     ScrollbarPart pressedPart() const { return m_pressedPart; }
     ScrollbarPart hoveredPart() const { return m_hoveredPart; }
     virtual void setHoveredPart(ScrollbarPart);
     virtual void setPressedPart(ScrollbarPart);
 
     void setSteps(int lineStep, int pageStep, int pixelsPerStep = 1);
-    bool setValue(int);
+    bool setValue(int, ScrollSource source);
     void setProportion(int visibleSize, int totalSize);
     void setPressedPos(int p) { m_pressedPos = p; }
 
     bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1);
     
     virtual void paint(GraphicsContext*, const IntRect& damageRect);
 
     bool enabled() const { return m_enabled; }
     virtual void setEnabled(bool e);
 
@@ skipping 71 matching lines @@
     bool m_enabled;
 
     Timer<Scrollbar> m_scrollTimer;
     bool m_overlapsResizer;
     
     bool m_suppressInvalidation;
 
 private:
     virtual bool isScrollbar() const { return true; }
 
-    bool setCurrentPos(float pos);
+    bool setCurrentPos(float pos, ScrollSource source);
 };
 
 }
 
 #endif