Merge 76455 - 2011-01-22 John Abd-El-Malek <jam@chromium.org>...

Source/WebKit/chromium/src/WebScrollbarImpl.cpp

Index: Source/WebKit/chromium/src/WebScrollbarImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/WebScrollbarImpl.cpp	(revision 76538)
+++ Source/WebKit/chromium/src/WebScrollbarImpl.cpp	(working copy)
@@ -311,4 +311,14 @@
         tickmarks[i] = ticks[i];
 }
 
+Scrollbar* WebScrollbarImpl::horizontalScrollbar() const
+{
+    return m_scrollbar->orientation() == HorizontalScrollbar ? m_scrollbar.get() : 0;
+}
+
+Scrollbar* WebScrollbarImpl::verticalScrollbar() const
+{
+    return m_scrollbar->orientation() == VerticalScrollbar ? m_scrollbar.get() : 0;
+}
+
 } // namespace WebKit