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

[rniwa at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 3e8757a5e0f8b380b15f95249ff49aa1d48682ee
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 21 20:54:26 2011 +0000

    2011-01-21  Ryosuke Niwa  <rniwa at webkit.org>
    
            Unreviewed; another Chromium build fix attempt for r76378.
    
            * src/WebScrollbarImpl.cpp:
            (WebKit::WebScrollbar::create):
            (WebKit::WebScrollbarImpl::WebScrollbarImpl):
            (WebKit::WebScrollbarImpl::setValue):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76383 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 8562c90..a00c988 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,5 +1,14 @@
 2011-01-21  Ryosuke Niwa  <rniwa at webkit.org>
 
+        Unreviewed; another Chromium build fix attempt for r76378.
+
+        * src/WebScrollbarImpl.cpp:
+        (WebKit::WebScrollbar::create):
+        (WebKit::WebScrollbarImpl::WebScrollbarImpl):
+        (WebKit::WebScrollbarImpl::setValue):
+
+2011-01-21  Ryosuke Niwa  <rniwa at webkit.org>
+
         Unreviewed Chromium build fix attempt for r76378.
 
         * src/WebScrollbarImpl.cpp:
diff --git a/Source/WebKit/chromium/src/WebScrollbarImpl.cpp b/Source/WebKit/chromium/src/WebScrollbarImpl.cpp
index 84a6bd7..05d2d1f 100644
--- a/Source/WebKit/chromium/src/WebScrollbarImpl.cpp
+++ b/Source/WebKit/chromium/src/WebScrollbarImpl.cpp
@@ -41,7 +41,7 @@
 #include "WebInputEvent.h"
 #include "WebInputEventConversion.h"
 #include "WebRect.h"
-#include "ScrollableArea.h"
+#include "WebScrollbarClient.h"
 #include "WebVector.h"
 #include "WebViewImpl.h"
 
@@ -50,7 +50,7 @@ using namespace WebCore;
 
 namespace WebKit {
 
-WebScrollbar* WebScrollbar::create(ScrollableArea* client, Orientation orientation)
+WebScrollbar* WebScrollbar::create(WebScrollbarClient* client, Orientation orientation)
 {
     return new WebScrollbarImpl(client, orientation);
 }
@@ -60,7 +60,7 @@ int WebScrollbar::defaultThickness()
     return ScrollbarTheme::nativeTheme()->scrollbarThickness();
 }
 
-WebScrollbarImpl::WebScrollbarImpl(ScrollableArea* client, Orientation orientation)
+WebScrollbarImpl::WebScrollbarImpl(WebScrollbarClient* client, Orientation orientation)
     : m_client(client)
     , m_scrollOffset(0)
 {
@@ -95,7 +95,7 @@ int WebScrollbarImpl::value() const
 
 void WebScrollbarImpl::setValue(int position)
 {
-    WebCore::ScrollbarClient::scrollToOffsetWithoutAnimation(m_scrollbar->orientation(), position);
+    WebCore::ScrollableArea::scrollToOffsetWithoutAnimation(m_scrollbar->orientation(), position);
 }
 
 void WebScrollbarImpl::setDocumentSize(int size)

-- 
WebKit Debian packaging