| Index: content/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
|
| diff --git a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc b/content/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
|
| similarity index 71%
|
| rename from webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
|
| rename to content/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
|
| index eabaa4f489efd3bab00752bf121cdd3076412d4f..25d57071eea904722d334593f94558b2b813470f 100644
|
| --- a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
|
| +++ b/content/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
|
| @@ -2,14 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h"
|
| +#include "content/renderer/compositor_bindings/web_scrollbar_layer_impl.h"
|
|
|
| #include "cc/layers/layer.h"
|
| #include "cc/layers/painted_scrollbar_layer.h"
|
| #include "cc/layers/scrollbar_layer_interface.h"
|
| #include "cc/layers/solid_color_scrollbar_layer.h"
|
| -#include "webkit/renderer/compositor_bindings/scrollbar_impl.h"
|
| -#include "webkit/renderer/compositor_bindings/web_layer_impl.h"
|
| +#include "content/renderer/compositor_bindings/scrollbar_impl.h"
|
| +#include "content/renderer/compositor_bindings/web_layer_impl.h"
|
|
|
| using cc::PaintedScrollbarLayer;
|
| using cc::SolidColorScrollbarLayer;
|
| @@ -19,22 +19,24 @@ namespace {
|
| cc::ScrollbarOrientation ConvertOrientation(
|
| blink::WebScrollbar::Orientation orientation) {
|
| return orientation == blink::WebScrollbar::Horizontal ? cc::HORIZONTAL
|
| - : cc::VERTICAL;
|
| + : cc::VERTICAL;
|
| }
|
|
|
| } // namespace
|
|
|
| -namespace webkit {
|
| +namespace content {
|
|
|
| WebScrollbarLayerImpl::WebScrollbarLayerImpl(
|
| blink::WebScrollbar* scrollbar,
|
| blink::WebScrollbarThemePainter painter,
|
| blink::WebScrollbarThemeGeometry* geometry)
|
| : layer_(new WebLayerImpl(PaintedScrollbarLayer::Create(
|
| - scoped_ptr<cc::Scrollbar>(new ScrollbarImpl(
|
| - make_scoped_ptr(scrollbar),
|
| - painter,
|
| - make_scoped_ptr(geometry))).Pass(), 0))) {}
|
| + scoped_ptr<cc::Scrollbar>(
|
| + new ScrollbarImpl(make_scoped_ptr(scrollbar),
|
| + painter,
|
| + make_scoped_ptr(geometry))).Pass(),
|
| + 0))) {
|
| +}
|
|
|
| WebScrollbarLayerImpl::WebScrollbarLayerImpl(
|
| blink::WebScrollbar::Orientation orientation,
|
| @@ -46,11 +48,15 @@ WebScrollbarLayerImpl::WebScrollbarLayerImpl(
|
| thumb_thickness,
|
| track_start,
|
| is_left_side_vertical_scrollbar,
|
| - 0))) {}
|
| + 0))) {
|
| +}
|
|
|
| -WebScrollbarLayerImpl::~WebScrollbarLayerImpl() {}
|
| +WebScrollbarLayerImpl::~WebScrollbarLayerImpl() {
|
| +}
|
|
|
| -blink::WebLayer* WebScrollbarLayerImpl::layer() { return layer_.get(); }
|
| +blink::WebLayer* WebScrollbarLayerImpl::layer() {
|
| + return layer_.get();
|
| +}
|
|
|
| void WebScrollbarLayerImpl::setScrollLayer(blink::WebLayer* layer) {
|
| cc::Layer* scroll_layer =
|
| @@ -64,4 +70,5 @@ void WebScrollbarLayerImpl::setClipLayer(blink::WebLayer* layer) {
|
| layer_->layer()->ToScrollbarLayer()->SetClipLayer(clip_layer->id());
|
| }
|
|
|
| -} // namespace webkit
|
| +} // namespace content
|
| +
|
|
|