Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 80 insertions, 0 deletions

diff --git a/Source/WebCore/platform/ScrollbarClient.h b/Source/WebCore/platform/ScrollbarClient.h
new file mode 100644
index 0000000..ab3b10e
--- /dev/null
+++ b/Source/WebCore/platform/ScrollbarClient.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2008 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
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#ifndef ScrollbarClient_h
+#define ScrollbarClient_h
+
+#include "IntPoint.h"
+#include "IntRect.h"
+#include "Scrollbar.h"
+#include <wtf/Vector.h>
+
+namespace WebCore {
+
+class ScrollAnimator;
+
+class ScrollbarClient {
+public:
+    ScrollbarClient();
+    virtual ~ScrollbarClient();
+
+    bool scroll(ScrollbarOrientation orientation, ScrollGranularity granularity, float step, float multiplier);
+    void setScrollPositionAndStopAnimation(ScrollbarOrientation orientation, float pos);
+
+    virtual int scrollSize(ScrollbarOrientation orientation) const = 0;
+    virtual void setScrollOffsetFromAnimation(const IntPoint&) = 0;
+    virtual void valueChanged(Scrollbar*) = 0;
+    virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) = 0;
+    virtual bool isActive() const = 0;
+    virtual bool scrollbarCornerPresent() const = 0;
+
+    virtual void getTickmarks(Vector<IntRect>&) const { }
+
+    // Convert points and rects between the scrollbar and its containing view.
+    // The client needs to implement these in order to be aware of layout effects
+    // like CSS transforms.
+    virtual IntRect convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntRect& scrollbarRect) const
+    {
+        return scrollbar->Widget::convertToContainingView(scrollbarRect);
+    }
+    virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntRect& parentRect) const
+    {
+        return scrollbar->Widget::convertFromContainingView(parentRect);
+    }
+    virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntPoint& scrollbarPoint) const
+    {
+        return scrollbar->Widget::convertToContainingView(scrollbarPoint);
+    }
+    virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntPoint& parentPoint) const
+    {
+        return scrollbar->Widget::convertFromContainingView(parentPoint);
+    }
+
+private:
+    OwnPtr<ScrollAnimator> m_scrollAnimator;
+};
+
+}
+#endif