summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-28 07:41:16 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-28 07:41:16 +0000
commit467b3617741085380e9fb5718ad17243729389b4 (patch)
treea0924a8e55f3a771e9e8dc76c21a3a9ee7e31e91 /webkit
parent1830d9898c3dc938c4a79af6d871390aa0e772d1 (diff)
downloadchromium_src-467b3617741085380e9fb5718ad17243729389b4.zip
chromium_src-467b3617741085380e9fb5718ad17243729389b4.tar.gz
chromium_src-467b3617741085380e9fb5718ad17243729389b4.tar.bz2
Update libcc / bindings snapshot to WebKit r126830
BUG= Review URL: https://chromiumcodereview.appspot.com/10879109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/compositor/WebScrollbarLayerImpl.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/compositor/WebScrollbarLayerImpl.cpp b/webkit/compositor/WebScrollbarLayerImpl.cpp
index c4f2071..45fdc43 100644
--- a/webkit/compositor/WebScrollbarLayerImpl.cpp
+++ b/webkit/compositor/WebScrollbarLayerImpl.cpp
@@ -8,14 +8,13 @@
#include "ScrollbarLayerChromium.h"
#include "WebLayerImpl.h"
-using WebCore::Scrollbar;
using WebCore::ScrollbarLayerChromium;
namespace WebKit {
-WebScrollbarLayer* WebScrollbarLayer::create(WebCore::Scrollbar* scrollbar, WebScrollbarThemePainter painter, PassOwnPtr<WebScrollbarThemeGeometry> geometry)
+WebScrollbarLayer* WebScrollbarLayer::create(WebScrollbar* scrollbar, WebScrollbarThemePainter painter, WebScrollbarThemeGeometry* geometry)
{
- return new WebScrollbarLayerImpl(ScrollbarLayerChromium::create(WebScrollbar::create(scrollbar), painter, geometry, 0));
+ return new WebScrollbarLayerImpl(ScrollbarLayerChromium::create(adoptPtr(scrollbar), painter, adoptPtr(geometry), 0));
}