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

Side by Side Diff: cc/test/fake_painted_scrollbar_layer.cc

Issue 1122393003: CC: Plumb LayerSettings parameter for cc::Layer construction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 7 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/test/fake_painted_scrollbar_layer.h ('k') | cc/test/fake_picture_layer.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/test/fake_painted_scrollbar_layer.h" 5 #include "cc/test/fake_painted_scrollbar_layer.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "cc/resources/resource_update_queue.h" 8 #include "cc/resources/resource_update_queue.h"
9 #include "cc/test/fake_scrollbar.h" 9 #include "cc/test/fake_scrollbar.h"
10 10
11 namespace cc { 11 namespace cc {
12 12
13 scoped_refptr<FakePaintedScrollbarLayer> FakePaintedScrollbarLayer::Create( 13 scoped_refptr<FakePaintedScrollbarLayer> FakePaintedScrollbarLayer::Create(
14 const LayerSettings& settings,
14 bool paint_during_update, 15 bool paint_during_update,
15 bool has_thumb, 16 bool has_thumb,
16 int scrolling_layer_id) { 17 int scrolling_layer_id) {
17 FakeScrollbar* fake_scrollbar = new FakeScrollbar( 18 FakeScrollbar* fake_scrollbar = new FakeScrollbar(
18 paint_during_update, has_thumb, false); 19 paint_during_update, has_thumb, false);
19 return make_scoped_refptr(new FakePaintedScrollbarLayer( 20 return make_scoped_refptr(new FakePaintedScrollbarLayer(
20 fake_scrollbar, scrolling_layer_id)); 21 settings, fake_scrollbar, scrolling_layer_id));
21 } 22 }
22 23
23 FakePaintedScrollbarLayer::FakePaintedScrollbarLayer( 24 FakePaintedScrollbarLayer::FakePaintedScrollbarLayer(
25 const LayerSettings& settings,
24 FakeScrollbar* fake_scrollbar, 26 FakeScrollbar* fake_scrollbar,
25 int scrolling_layer_id) 27 int scrolling_layer_id)
26 : PaintedScrollbarLayer(scoped_ptr<Scrollbar>(fake_scrollbar).Pass(), 28 : PaintedScrollbarLayer(settings,
29 scoped_ptr<Scrollbar>(fake_scrollbar).Pass(),
27 scrolling_layer_id), 30 scrolling_layer_id),
28 update_count_(0), 31 update_count_(0),
29 push_properties_count_(0), 32 push_properties_count_(0),
30 fake_scrollbar_(fake_scrollbar) { 33 fake_scrollbar_(fake_scrollbar) {
31 SetBounds(gfx::Size(1, 1)); 34 SetBounds(gfx::Size(1, 1));
32 SetIsDrawable(true); 35 SetIsDrawable(true);
33 } 36 }
34 37
35 FakePaintedScrollbarLayer::~FakePaintedScrollbarLayer() {} 38 FakePaintedScrollbarLayer::~FakePaintedScrollbarLayer() {}
36 39
(...skipping 10 matching lines...) Expand all
47 ++push_properties_count_; 50 ++push_properties_count_;
48 } 51 }
49 52
50 scoped_ptr<base::AutoReset<bool>> 53 scoped_ptr<base::AutoReset<bool>>
51 FakePaintedScrollbarLayer::IgnoreSetNeedsCommit() { 54 FakePaintedScrollbarLayer::IgnoreSetNeedsCommit() {
52 return make_scoped_ptr( 55 return make_scoped_ptr(
53 new base::AutoReset<bool>(&ignore_set_needs_commit_, true)); 56 new base::AutoReset<bool>(&ignore_set_needs_commit_, true));
54 } 57 }
55 58
56 } // namespace cc 59 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/fake_painted_scrollbar_layer.h ('k') | cc/test/fake_picture_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698