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

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

Issue 2743653003: Revert of Remove indirection: setup scrollbar scroll layers in the scrollbar constructor (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 | « cc/blink/web_compositor_support_impl.h ('k') | cc/blink/web_scrollbar_layer_impl.h » ('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_compositor_support_impl.h" 5 #include "cc/blink/web_compositor_support_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/web_content_layer_impl.h" 10 #include "cc/blink/web_content_layer_impl.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 std::unique_ptr<blink::WebImageLayer> 59 std::unique_ptr<blink::WebImageLayer>
60 WebCompositorSupportImpl::createImageLayer() { 60 WebCompositorSupportImpl::createImageLayer() {
61 return base::MakeUnique<WebImageLayerImpl>(); 61 return base::MakeUnique<WebImageLayerImpl>();
62 } 62 }
63 63
64 std::unique_ptr<WebScrollbarLayer> 64 std::unique_ptr<WebScrollbarLayer>
65 WebCompositorSupportImpl::createScrollbarLayer( 65 WebCompositorSupportImpl::createScrollbarLayer(
66 std::unique_ptr<WebScrollbar> scrollbar, 66 std::unique_ptr<WebScrollbar> scrollbar,
67 WebScrollbarThemePainter painter, 67 WebScrollbarThemePainter painter,
68 std::unique_ptr<WebScrollbarThemeGeometry> geometry, 68 std::unique_ptr<WebScrollbarThemeGeometry> geometry) {
69 blink::WebLayer* scroll_layer) { 69 return base::MakeUnique<WebScrollbarLayerImpl>(std::move(scrollbar), painter,
70 return base::MakeUnique<WebScrollbarLayerImpl>( 70 std::move(geometry));
71 std::move(scrollbar), painter, std::move(geometry), false, scroll_layer);
72 } 71 }
73 72
74 std::unique_ptr<WebScrollbarLayer> 73 std::unique_ptr<WebScrollbarLayer>
75 WebCompositorSupportImpl::createOverlayScrollbarLayer( 74 WebCompositorSupportImpl::createOverlayScrollbarLayer(
76 std::unique_ptr<WebScrollbar> scrollbar, 75 std::unique_ptr<WebScrollbar> scrollbar,
77 WebScrollbarThemePainter painter, 76 WebScrollbarThemePainter painter,
78 std::unique_ptr<WebScrollbarThemeGeometry> geometry, 77 std::unique_ptr<WebScrollbarThemeGeometry> geometry) {
79 blink::WebLayer* scroll_layer) { 78 return base::MakeUnique<WebScrollbarLayerImpl>(std::move(scrollbar), painter,
80 return base::MakeUnique<WebScrollbarLayerImpl>( 79 std::move(geometry), true);
81 std::move(scrollbar), painter, std::move(geometry), true, scroll_layer);
82 } 80 }
83 81
84 std::unique_ptr<WebScrollbarLayer> 82 std::unique_ptr<WebScrollbarLayer>
85 WebCompositorSupportImpl::createSolidColorScrollbarLayer( 83 WebCompositorSupportImpl::createSolidColorScrollbarLayer(
86 WebScrollbar::Orientation orientation, 84 WebScrollbar::Orientation orientation,
87 int thumb_thickness, 85 int thumb_thickness,
88 int track_start, 86 int track_start,
89 bool is_left_side_vertical_scrollbar, 87 bool is_left_side_vertical_scrollbar) {
90 blink::WebLayer* scroll_layer) {
91 return base::MakeUnique<WebScrollbarLayerImpl>( 88 return base::MakeUnique<WebScrollbarLayerImpl>(
92 orientation, thumb_thickness, track_start, 89 orientation, thumb_thickness, track_start,
93 is_left_side_vertical_scrollbar, scroll_layer); 90 is_left_side_vertical_scrollbar);
94 } 91 }
95 92
96 } // namespace cc_blink 93 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/blink/web_compositor_support_impl.h ('k') | cc/blink/web_scrollbar_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698