[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[jam at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit e0a200f5453e0aba7098f3c04d8a3daf6fbf1d97
Author: jam at chromium.org <jam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 22 21:55:43 2011 +0000

    2011-01-22  John Abd-El-Malek  <jam at 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:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76455 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 740f798..c529c12 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-22  John Abd-El-Malek  <jam at 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 at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/Source/WebKit/chromium/src/WebScrollbarImpl.cpp b/Source/WebKit/chromium/src/WebScrollbarImpl.cpp
index 05d2d1f..a945fd3 100644
--- a/Source/WebKit/chromium/src/WebScrollbarImpl.cpp
+++ b/Source/WebKit/chromium/src/WebScrollbarImpl.cpp
@@ -311,4 +311,14 @@ void WebScrollbarImpl::getTickmarks(Vector<WebCore::IntRect>& tickmarks) const
         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
diff --git a/Source/WebKit/chromium/src/WebScrollbarImpl.h b/Source/WebKit/chromium/src/WebScrollbarImpl.h
index 4dcfd5d..ac120cf 100644
--- a/Source/WebKit/chromium/src/WebScrollbarImpl.h
+++ b/Source/WebKit/chromium/src/WebScrollbarImpl.h
@@ -65,6 +65,8 @@ public:
     virtual bool isActive() const;
     virtual bool scrollbarCornerPresent() const;
     virtual void getTickmarks(Vector<WebCore::IntRect>&) const;
+    virtual WebCore::Scrollbar* horizontalScrollbar() const;
+    virtual WebCore::Scrollbar* verticalScrollbar() const;
 
 private:
     bool onMouseDown(const WebInputEvent& event);

-- 
WebKit Debian packaging