Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1210)

Unified Diff: webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc

Issue 61553006: Rename WebKit namespace to blink (part 5) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
diff --git a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc b/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
index 68a35d333c8fa2e95cf66e3541eac133da042fbd..265a97db41c55f70b9c424757b1f56624eba010c 100644
--- a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
@@ -16,8 +16,8 @@ using cc::SolidColorScrollbarLayer;
namespace {
cc::ScrollbarOrientation ConvertOrientation(
- WebKit::WebScrollbar::Orientation orientation) {
- return orientation == WebKit::WebScrollbar::Horizontal ? cc::HORIZONTAL
+ blink::WebScrollbar::Orientation orientation) {
+ return orientation == blink::WebScrollbar::Horizontal ? cc::HORIZONTAL
: cc::VERTICAL;
}
@@ -26,9 +26,9 @@ cc::ScrollbarOrientation ConvertOrientation(
namespace webkit {
WebScrollbarLayerImpl::WebScrollbarLayerImpl(
- WebKit::WebScrollbar* scrollbar,
- WebKit::WebScrollbarThemePainter painter,
- WebKit::WebScrollbarThemeGeometry* geometry)
+ blink::WebScrollbar* scrollbar,
+ blink::WebScrollbarThemePainter painter,
+ blink::WebScrollbarThemeGeometry* geometry)
: layer_(new WebLayerImpl(PaintedScrollbarLayer::Create(
scoped_ptr<cc::Scrollbar>(new ScrollbarImpl(
make_scoped_ptr(scrollbar),
@@ -36,7 +36,7 @@ WebScrollbarLayerImpl::WebScrollbarLayerImpl(
make_scoped_ptr(geometry))).Pass(), 0))) {}
WebScrollbarLayerImpl::WebScrollbarLayerImpl(
- WebKit::WebScrollbar::Orientation orientation,
+ blink::WebScrollbar::Orientation orientation,
int thumb_thickness,
bool is_left_side_vertical_scrollbar)
: layer_(new WebLayerImpl(
@@ -48,9 +48,9 @@ WebScrollbarLayerImpl::WebScrollbarLayerImpl(
WebScrollbarLayerImpl::~WebScrollbarLayerImpl() {}
-WebKit::WebLayer* WebScrollbarLayerImpl::layer() { return layer_.get(); }
+blink::WebLayer* WebScrollbarLayerImpl::layer() { return layer_.get(); }
-void WebScrollbarLayerImpl::setScrollLayer(WebKit::WebLayer* layer) {
+void WebScrollbarLayerImpl::setScrollLayer(blink::WebLayer* layer) {
int id = layer ? static_cast<WebLayerImpl*>(layer)->layer()->id() : 0;
static_cast<PaintedScrollbarLayer*>(layer_->layer())->SetScrollLayerId(id);
}

Powered by Google App Engine
This is Rietveld 408576698