Rolls cc and webkit_compositor up to 127340

webkit/compositor/WebScrollbarLayerImpl.cpp

Index: webkit/compositor/WebScrollbarLayerImpl.cpp
diff --git a/webkit/compositor/WebScrollbarLayerImpl.cpp b/webkit/compositor/WebScrollbarLayerImpl.cpp
index 45fdc4367b4cab8e1316785c967b23bf8c8c9c6c..6aa6978146dae349377714b974665b7c3993bbde 100644
--- a/webkit/compositor/WebScrollbarLayerImpl.cpp
+++ b/webkit/compositor/WebScrollbarLayerImpl.cpp
@@ -14,12 +14,12 @@ namespace WebKit {
 
 WebScrollbarLayer* WebScrollbarLayer::create(WebScrollbar* scrollbar, WebScrollbarThemePainter painter, WebScrollbarThemeGeometry* geometry)
 {
-    return new WebScrollbarLayerImpl(ScrollbarLayerChromium::create(adoptPtr(scrollbar), painter, adoptPtr(geometry), 0));
+    return new WebScrollbarLayerImpl(scrollbar, painter, geometry);
 }
 
 
-WebScrollbarLayerImpl::WebScrollbarLayerImpl(PassRefPtr<WebCore::ScrollbarLayerChromium> layer)
-    : m_layer(adoptPtr(new WebLayerImpl(layer)))
+WebScrollbarLayerImpl::WebScrollbarLayerImpl(WebScrollbar* scrollbar, WebScrollbarThemePainter painter, WebScrollbarThemeGeometry* geometry)
+    : m_layer(adoptPtr(new WebLayerImpl(ScrollbarLayerChromium::create(adoptPtr(scrollbar), painter, adoptPtr(geometry), 0))))
 {
 }