| Index: content/renderer/compositor_bindings/scrollbar_impl.cc
|
| diff --git a/webkit/renderer/compositor_bindings/scrollbar_impl.cc b/content/renderer/compositor_bindings/scrollbar_impl.cc
|
| similarity index 87%
|
| rename from webkit/renderer/compositor_bindings/scrollbar_impl.cc
|
| rename to content/renderer/compositor_bindings/scrollbar_impl.cc
|
| index adbb6b81a5061d4eff414efc1b7e3d592820cdee..fa5f2abe39ec4520338bbef7d39a69e1027fb41c 100644
|
| --- a/webkit/renderer/compositor_bindings/scrollbar_impl.cc
|
| +++ b/content/renderer/compositor_bindings/scrollbar_impl.cc
|
| @@ -2,7 +2,7 @@
|
| // 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/scrollbar_impl.h"
|
| +#include "content/renderer/compositor_bindings/scrollbar_impl.h"
|
|
|
| #include "base/logging.h"
|
| #include "third_party/WebKit/public/platform/WebScrollbar.h"
|
| @@ -10,7 +10,7 @@
|
|
|
| using blink::WebScrollbar;
|
|
|
| -namespace webkit {
|
| +namespace content {
|
|
|
| ScrollbarImpl::ScrollbarImpl(
|
| scoped_ptr<WebScrollbar> scrollbar,
|
| @@ -18,9 +18,11 @@ ScrollbarImpl::ScrollbarImpl(
|
| scoped_ptr<blink::WebScrollbarThemeGeometry> geometry)
|
| : scrollbar_(scrollbar.Pass()),
|
| painter_(painter),
|
| - geometry_(geometry.Pass()) {}
|
| + geometry_(geometry.Pass()) {
|
| +}
|
|
|
| -ScrollbarImpl::~ScrollbarImpl() {}
|
| +ScrollbarImpl::~ScrollbarImpl() {
|
| +}
|
|
|
| cc::ScrollbarOrientation ScrollbarImpl::Orientation() const {
|
| if (scrollbar_->orientation() == WebScrollbar::Horizontal)
|
| @@ -62,9 +64,9 @@ gfx::Rect ScrollbarImpl::TrackRect() const {
|
| return geometry_->trackRect(scrollbar_.get());
|
| }
|
|
|
| -void ScrollbarImpl::PaintPart(
|
| - SkCanvas* canvas, cc::ScrollbarPart part,
|
| - const gfx::Rect& content_rect) {
|
| +void ScrollbarImpl::PaintPart(SkCanvas* canvas,
|
| + cc::ScrollbarPart part,
|
| + const gfx::Rect& content_rect) {
|
| if (part == cc::THUMB) {
|
| painter_.paintThumb(canvas, content_rect);
|
| return;
|
| @@ -84,8 +86,7 @@ void ScrollbarImpl::PaintPart(
|
|
|
| gfx::Rect forward_button_start_paint_rect =
|
| geometry_->forwardButtonStartRect(scrollbar_.get());
|
| - painter_.paintForwardButtonStart(canvas,
|
| - forward_button_start_paint_rect);
|
| + painter_.paintForwardButtonStart(canvas, forward_button_start_paint_rect);
|
|
|
| gfx::Rect forward_button_end_paint_rect =
|
| geometry_->forwardButtonEndRect(scrollbar_.get());
|
| @@ -104,4 +105,4 @@ void ScrollbarImpl::PaintPart(
|
| painter_.paintTickmarks(canvas, track_paint_rect);
|
| }
|
|
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|