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

Side by Side Diff: cc/blink/web_scrollbar_layer_impl.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 months 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 unified diff | Download patch
« no previous file with comments | « cc/blink/web_scrollbar_layer_impl.h ('k') | cc/debug/benchmark_instrumentation.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "cc/blink/web_scrollbar_layer_impl.h" 5 #include "cc/blink/web_scrollbar_layer_impl.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "cc/blink/scrollbar_impl.h" 8 #include "cc/blink/scrollbar_impl.h"
8 #include "cc/blink/web_layer_impl.h" 9 #include "cc/blink/web_layer_impl.h"
9 #include "cc/layers/layer.h" 10 #include "cc/layers/layer.h"
10 #include "cc/layers/painted_scrollbar_layer.h" 11 #include "cc/layers/painted_scrollbar_layer.h"
11 #include "cc/layers/scrollbar_layer_interface.h" 12 #include "cc/layers/scrollbar_layer_interface.h"
12 #include "cc/layers/solid_color_scrollbar_layer.h" 13 #include "cc/layers/solid_color_scrollbar_layer.h"
13 14
14 using cc::PaintedScrollbarLayer; 15 using cc::PaintedScrollbarLayer;
15 using cc::SolidColorScrollbarLayer; 16 using cc::SolidColorScrollbarLayer;
16 17
17 namespace { 18 namespace {
18 19
19 cc::ScrollbarOrientation ConvertOrientation( 20 cc::ScrollbarOrientation ConvertOrientation(
20 blink::WebScrollbar::Orientation orientation) { 21 blink::WebScrollbar::Orientation orientation) {
21 return orientation == blink::WebScrollbar::Horizontal ? cc::HORIZONTAL 22 return orientation == blink::WebScrollbar::Horizontal ? cc::HORIZONTAL
22 : cc::VERTICAL; 23 : cc::VERTICAL;
23 } 24 }
24 25
25 } // namespace 26 } // namespace
26 27
27 namespace cc_blink { 28 namespace cc_blink {
28 29
29 WebScrollbarLayerImpl::WebScrollbarLayerImpl( 30 WebScrollbarLayerImpl::WebScrollbarLayerImpl(
30 blink::WebScrollbar* scrollbar, 31 blink::WebScrollbar* scrollbar,
31 blink::WebScrollbarThemePainter painter, 32 blink::WebScrollbarThemePainter painter,
32 blink::WebScrollbarThemeGeometry* geometry) 33 blink::WebScrollbarThemeGeometry* geometry)
33 : layer_(new WebLayerImpl(PaintedScrollbarLayer::Create( 34 : layer_(new WebLayerImpl(PaintedScrollbarLayer::Create(
34 35
35 scoped_ptr<cc::Scrollbar>( 36 std::unique_ptr<cc::Scrollbar>(
36 new ScrollbarImpl(make_scoped_ptr(scrollbar), 37 new ScrollbarImpl(base::WrapUnique(scrollbar),
37 painter, 38 painter,
38 make_scoped_ptr(geometry))), 39 base::WrapUnique(geometry))),
39 0))) {} 40 0))) {}
40 41
41 WebScrollbarLayerImpl::WebScrollbarLayerImpl( 42 WebScrollbarLayerImpl::WebScrollbarLayerImpl(
42 blink::WebScrollbar::Orientation orientation, 43 blink::WebScrollbar::Orientation orientation,
43 int thumb_thickness, 44 int thumb_thickness,
44 int track_start, 45 int track_start,
45 bool is_left_side_vertical_scrollbar) 46 bool is_left_side_vertical_scrollbar)
46 : layer_(new WebLayerImpl( 47 : layer_(new WebLayerImpl(
47 SolidColorScrollbarLayer::Create(ConvertOrientation(orientation), 48 SolidColorScrollbarLayer::Create(ConvertOrientation(orientation),
48 thumb_thickness, 49 thumb_thickness,
49 track_start, 50 track_start,
50 is_left_side_vertical_scrollbar, 51 is_left_side_vertical_scrollbar,
51 0))) {} 52 0))) {}
52 53
53 WebScrollbarLayerImpl::~WebScrollbarLayerImpl() { 54 WebScrollbarLayerImpl::~WebScrollbarLayerImpl() {
54 } 55 }
55 56
56 blink::WebLayer* WebScrollbarLayerImpl::layer() { 57 blink::WebLayer* WebScrollbarLayerImpl::layer() {
57 return layer_.get(); 58 return layer_.get();
58 } 59 }
59 60
60 void WebScrollbarLayerImpl::setScrollLayer(blink::WebLayer* layer) { 61 void WebScrollbarLayerImpl::setScrollLayer(blink::WebLayer* layer) {
61 cc::Layer* scroll_layer = 62 cc::Layer* scroll_layer =
62 layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0; 63 layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0;
63 layer_->layer()->ToScrollbarLayer()->SetScrollLayer( 64 layer_->layer()->ToScrollbarLayer()->SetScrollLayer(
64 scroll_layer ? scroll_layer->id() : cc::Layer::INVALID_ID); 65 scroll_layer ? scroll_layer->id() : cc::Layer::INVALID_ID);
65 } 66 }
66 67
67 } // namespace cc_blink 68 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/blink/web_scrollbar_layer_impl.h ('k') | cc/debug/benchmark_instrumentation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698