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

[aroben at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 27f1077e662fdd84d7843a853437f3940b1f502d
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 28 01:19:27 2011 +0000

    Fix scrollbars in Safari's Downloads window and Bookmarks view by implementing two needed functions from ScrollableArea.
    
    Patch by Sam Weinig <sam at webkit.org> on 2011-01-27
    Reviewed by Adam Roben.
    
    * WebScrollBar.cpp:
    (WebScrollBar::horizontalScrollbar): Return the WebCore::Scrollbar if
    we are a horizontal scrollbar.
    (WebScrollBar::verticalScrollbar): Return the WebCore::Scrollbar if we
    are a vertical scrollbar.
    * WebScrollBar.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76871 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index 4ff9717..416b7a7 100644
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-27  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Fix scrollbars in Safari's Downloads window and Bookmarks view by
+        implementing two needed functions from ScrollableArea.
+
+        * WebScrollBar.cpp:
+        (WebScrollBar::horizontalScrollbar): Return the WebCore::Scrollbar if
+        we are a horizontal scrollbar.
+        (WebScrollBar::verticalScrollbar): Return the WebCore::Scrollbar if we
+        are a vertical scrollbar.
+        * WebScrollBar.h:
+
 2011-01-27  Adam Roben  <aroben at apple.com>
 
         Trim down #includes in WebView.h
diff --git a/Source/WebKit/win/WebScrollBar.cpp b/Source/WebKit/win/WebScrollBar.cpp
index 45bc8f3..94faaf8 100644
--- a/Source/WebKit/win/WebScrollBar.cpp
+++ b/Source/WebKit/win/WebScrollBar.cpp
@@ -275,3 +275,13 @@ void WebScrollBar::invalidateScrollbarRect(Scrollbar*, const IntRect& rect)
     RECT r = rect;
     ::InvalidateRect(m_containingWindow, &r, false);
 }
+
+Scrollbar* WebScrollBar::horizontalScrollbar() const
+{
+    return m_scrollBar->orientation() == HorizontalScrollbar ? m_scrollBar.get() : 0;
+}
+
+Scrollbar* WebScrollBar::verticalScrollbar() const
+{
+    return m_scrollBar->orientation() == VerticalScrollbar ? m_scrollBar.get() : 0;
+}
diff --git a/Source/WebKit/win/WebScrollBar.h b/Source/WebKit/win/WebScrollBar.h
index ca44e8b..39457d4 100644
--- a/Source/WebKit/win/WebScrollBar.h
+++ b/Source/WebKit/win/WebScrollBar.h
@@ -123,6 +123,9 @@ protected:
 
     virtual bool scrollbarCornerPresent() const { return false; }
 
+    virtual WebCore::Scrollbar* horizontalScrollbar() const; 
+    virtual WebCore::Scrollbar* verticalScrollbar() const; 
+
     ULONG m_refCount;
     HWND m_containingWindow;
     int m_currentPosition;

-- 
WebKit Debian packaging