Changeset 76455 in webkit

Timestamp:

Jan 22, 2011 1:55:43 PM (13 years ago)

Author:

jam@chromium.org

Message:

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

Reviewed by Adam Barth.

[chromium]: Fix WebScrollbarImpl not getting scroll events after recent scrollbar refactoring
​https://bugs.webkit.org/show_bug.cgi?id=52967

• src/WebScrollbarImpl.cpp: (WebKit::WebScrollbarImpl::horizontalScrollbar): (WebKit::WebScrollbarImpl::verticalScrollbar):
• src/WebScrollbarImpl.h:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebScrollbarImpl.cpp (modified) (1 diff)
• src/WebScrollbarImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-01-22  John Abd-El-Malek  <jam@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [chromium]: Fix WebScrollbarImpl not getting scroll events after recent scrollbar refactoring
+        https://bugs.webkit.org/show_bug.cgi?id=52967
+
+        * src/WebScrollbarImpl.cpp:
+        (WebKit::WebScrollbarImpl::horizontalScrollbar):
+        (WebKit::WebScrollbarImpl::verticalScrollbar):
+        * src/WebScrollbarImpl.h:
+
 2011-01-21  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebKit/chromium/src/WebScrollbarImpl.cpp

@@ -312 +312 @@
 }
 
+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

trunk/Source/WebKit/chromium/src/WebScrollbarImpl.h

@@ -66 +66 @@
     virtual bool scrollbarCornerPresent() const;
     virtual void getTickmarks(Vector<WebCore::IntRect>&) const;
+    virtual WebCore::Scrollbar* horizontalScrollbar() const;
+    virtual WebCore::Scrollbar* verticalScrollbar() const;
 
 private: