OLD | NEW |
---|---|
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h" | 5 #include "webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h" |
6 | 6 |
7 #include "cc/base/switches.h" | |
7 #include "cc/layers/scrollbar_layer.h" | 8 #include "cc/layers/scrollbar_layer.h" |
8 #include "third_party/WebKit/public/platform/WebScrollbar.h" | 9 #include "third_party/WebKit/public/platform/WebScrollbar.h" |
9 #include "webkit/renderer/compositor_bindings/scrollbar_impl.h" | 10 #include "webkit/renderer/compositor_bindings/scrollbar_impl.h" |
10 #include "webkit/renderer/compositor_bindings/web_layer_impl.h" | 11 #include "webkit/renderer/compositor_bindings/web_layer_impl.h" |
11 | 12 |
12 using cc::ScrollbarLayer; | 13 using cc::ScrollbarLayer; |
13 | 14 |
14 namespace webkit { | 15 namespace webkit { |
15 | 16 |
17 static bool forceSolidColorScrollbars() { | |
enne (OOO)
2013/06/27 18:01:54
style nit: this is Chromium code, so the 'f' shoul
wjmaclean
2013/06/27 18:10:32
I'll fix this. I wasn't sure what to do, as the si
| |
18 return cc::switches::ForceSolidColorScrollbars(); | |
19 } | |
20 | |
16 WebScrollbarLayerImpl::WebScrollbarLayerImpl( | 21 WebScrollbarLayerImpl::WebScrollbarLayerImpl( |
17 WebKit::WebScrollbar* scrollbar, | 22 WebKit::WebScrollbar* scrollbar, |
18 WebKit::WebScrollbarThemePainter painter, | 23 WebKit::WebScrollbarThemePainter painter, |
19 WebKit::WebScrollbarThemeGeometry* geometry) | 24 WebKit::WebScrollbarThemeGeometry* geometry) |
20 : layer_(new WebLayerImpl(ScrollbarLayer::Create( | 25 : layer_(new WebLayerImpl( |
21 scoped_ptr<cc::Scrollbar>(new ScrollbarImpl( | 26 ScrollbarLayer::Create(scoped_ptr<cc::Scrollbar>(new ScrollbarImpl( |
22 make_scoped_ptr(scrollbar), | 27 make_scoped_ptr(scrollbar), |
23 painter, | 28 painter, |
24 make_scoped_ptr(geometry))).Pass(), 0))) {} | 29 make_scoped_ptr(geometry))).Pass(), |
30 0, | |
31 forceSolidColorScrollbars()))) {} | |
25 | 32 |
26 WebScrollbarLayerImpl::~WebScrollbarLayerImpl() {} | 33 WebScrollbarLayerImpl::~WebScrollbarLayerImpl() {} |
27 | 34 |
28 WebKit::WebLayer* WebScrollbarLayerImpl::layer() { return layer_.get(); } | 35 WebKit::WebLayer* WebScrollbarLayerImpl::layer() { return layer_.get(); } |
29 | 36 |
30 void WebScrollbarLayerImpl::setScrollLayer(WebKit::WebLayer* layer) { | 37 void WebScrollbarLayerImpl::setScrollLayer(WebKit::WebLayer* layer) { |
31 int id = layer ? static_cast<WebLayerImpl*>(layer)->layer()->id() : 0; | 38 int id = layer ? static_cast<WebLayerImpl*>(layer)->layer()->id() : 0; |
32 static_cast<ScrollbarLayer*>(layer_->layer())->SetScrollLayerId(id); | 39 static_cast<ScrollbarLayer*>(layer_->layer())->SetScrollLayerId(id); |
33 } | 40 } |
34 | 41 |
35 } // namespace webkit | 42 } // namespace webkit |
OLD | NEW |