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

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

Issue 2756343002: Reland of Use Layer::INVALID_ID instead of 0 for invalid layers in WebScrollbarLayerImpl (Closed)
Patch Set: Created 3 years, 9 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 | « no previous file | no next file » | 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 <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "cc/blink/scrollbar_impl.h" 10 #include "cc/blink/scrollbar_impl.h"
(...skipping 21 matching lines...) Expand all
32 namespace cc_blink { 32 namespace cc_blink {
33 33
34 WebScrollbarLayerImpl::WebScrollbarLayerImpl( 34 WebScrollbarLayerImpl::WebScrollbarLayerImpl(
35 std::unique_ptr<blink::WebScrollbar> scrollbar, 35 std::unique_ptr<blink::WebScrollbar> scrollbar,
36 blink::WebScrollbarThemePainter painter, 36 blink::WebScrollbarThemePainter painter,
37 std::unique_ptr<blink::WebScrollbarThemeGeometry> geometry) 37 std::unique_ptr<blink::WebScrollbarThemeGeometry> geometry)
38 : layer_(new WebLayerImpl(PaintedScrollbarLayer::Create( 38 : layer_(new WebLayerImpl(PaintedScrollbarLayer::Create(
39 base::MakeUnique<ScrollbarImpl>(std::move(scrollbar), 39 base::MakeUnique<ScrollbarImpl>(std::move(scrollbar),
40 painter, 40 painter,
41 std::move(geometry)), 41 std::move(geometry)),
42 0))) {} 42 cc::Layer::INVALID_ID))) {}
43 43
44 WebScrollbarLayerImpl::WebScrollbarLayerImpl( 44 WebScrollbarLayerImpl::WebScrollbarLayerImpl(
45 std::unique_ptr<blink::WebScrollbar> scrollbar, 45 std::unique_ptr<blink::WebScrollbar> scrollbar,
46 blink::WebScrollbarThemePainter painter, 46 blink::WebScrollbarThemePainter painter,
47 std::unique_ptr<blink::WebScrollbarThemeGeometry> geometry, 47 std::unique_ptr<blink::WebScrollbarThemeGeometry> geometry,
48 bool) 48 bool)
49 : layer_(new WebLayerImpl(PaintedOverlayScrollbarLayer::Create( 49 : layer_(new WebLayerImpl(PaintedOverlayScrollbarLayer::Create(
50 base::MakeUnique<ScrollbarImpl>(std::move(scrollbar), 50 base::MakeUnique<ScrollbarImpl>(std::move(scrollbar),
51 painter, 51 painter,
52 std::move(geometry)), 52 std::move(geometry)),
53 0))) {} 53 cc::Layer::INVALID_ID))) {}
54 54
55 WebScrollbarLayerImpl::WebScrollbarLayerImpl( 55 WebScrollbarLayerImpl::WebScrollbarLayerImpl(
56 blink::WebScrollbar::Orientation orientation, 56 blink::WebScrollbar::Orientation orientation,
57 int thumb_thickness, 57 int thumb_thickness,
58 int track_start, 58 int track_start,
59 bool is_left_side_vertical_scrollbar) 59 bool is_left_side_vertical_scrollbar)
60 : layer_(new WebLayerImpl( 60 : layer_(new WebLayerImpl(
61 SolidColorScrollbarLayer::Create(ConvertOrientation(orientation), 61 SolidColorScrollbarLayer::Create(ConvertOrientation(orientation),
62 thumb_thickness, 62 thumb_thickness,
63 track_start, 63 track_start,
64 is_left_side_vertical_scrollbar, 64 is_left_side_vertical_scrollbar,
65 0))) {} 65 cc::Layer::INVALID_ID))) {}
66 66
67 WebScrollbarLayerImpl::~WebScrollbarLayerImpl() { 67 WebScrollbarLayerImpl::~WebScrollbarLayerImpl() {
68 } 68 }
69 69
70 blink::WebLayer* WebScrollbarLayerImpl::layer() { 70 blink::WebLayer* WebScrollbarLayerImpl::layer() {
71 return layer_.get(); 71 return layer_.get();
72 } 72 }
73 73
74 void WebScrollbarLayerImpl::setScrollLayer(blink::WebLayer* layer) { 74 void WebScrollbarLayerImpl::setScrollLayer(blink::WebLayer* layer) {
75 cc::Layer* scroll_layer = 75 cc::Layer* scroll_layer =
76 layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0; 76 layer ? static_cast<WebLayerImpl*>(layer)->layer() : 0;
77 layer_->layer()->ToScrollbarLayer()->SetScrollLayer( 77 layer_->layer()->ToScrollbarLayer()->SetScrollLayer(
78 scroll_layer ? scroll_layer->id() : cc::Layer::INVALID_ID); 78 scroll_layer ? scroll_layer->id() : cc::Layer::INVALID_ID);
79 } 79 }
80 80
81 } // namespace cc_blink 81 } // namespace cc_blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698