[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
rniwa at webkit.org
rniwa at webkit.org
Sun Feb 20 23:34:42 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 6db60e7be937c9dbd36e0073c3c9743faab3518c
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 21 20:42:06 2011 +0000
2011-01-21 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed Chromium build fix attempt for r76378.
* src/WebScrollbarImpl.cpp:
(WebKit::WebScrollbar::create):
(WebKit::WebScrollbarImpl::WebScrollbarImpl):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76382 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 3a59a8a..8562c90 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-21 Ryosuke Niwa <rniwa at webkit.org>
+
+ Unreviewed Chromium build fix attempt for r76378.
+
+ * src/WebScrollbarImpl.cpp:
+ (WebKit::WebScrollbar::create):
+ (WebKit::WebScrollbarImpl::WebScrollbarImpl):
+
2011-01-21 Chris Rogers <crogers at google.com>
Reviewed by Kenneth Russell.
diff --git a/Source/WebKit/chromium/src/WebScrollbarImpl.cpp b/Source/WebKit/chromium/src/WebScrollbarImpl.cpp
index 004ae1c..84a6bd7 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 "WebScrollbarClient.h"
+#include "ScrollableArea.h"
#include "WebVector.h"
#include "WebViewImpl.h"
@@ -50,7 +50,7 @@ using namespace WebCore;
namespace WebKit {
-WebScrollbar* WebScrollbar::create(WebScrollbarClient* client, Orientation orientation)
+WebScrollbar* WebScrollbar::create(ScrollableArea* client, Orientation orientation)
{
return new WebScrollbarImpl(client, orientation);
}
@@ -60,7 +60,7 @@ int WebScrollbar::defaultThickness()
return ScrollbarTheme::nativeTheme()->scrollbarThickness();
}
-WebScrollbarImpl::WebScrollbarImpl(WebScrollbarClient* client, Orientation orientation)
+WebScrollbarImpl::WebScrollbarImpl(ScrollableArea* client, Orientation orientation)
: m_client(client)
, m_scrollOffset(0)
{
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list