OLD | NEW |
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 bool paint_during_update, | 14 bool paint_during_update, |
15 bool has_thumb, | 15 bool has_thumb, |
16 int scrolling_layer_id) { | 16 int scrolling_layer_id, |
17 FakeScrollbar* fake_scrollbar = new FakeScrollbar( | 17 FakeScrollbar* fake_scrollbar) { |
18 paint_during_update, has_thumb, false); | 18 if (!fake_scrollbar) |
| 19 fake_scrollbar = new FakeScrollbar(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 fake_scrollbar, scrolling_layer_id)); |
21 } | 22 } |
22 | 23 |
23 FakePaintedScrollbarLayer::FakePaintedScrollbarLayer( | 24 FakePaintedScrollbarLayer::FakePaintedScrollbarLayer( |
24 FakeScrollbar* fake_scrollbar, | 25 FakeScrollbar* fake_scrollbar, |
25 int scrolling_layer_id) | 26 int scrolling_layer_id) |
26 : PaintedScrollbarLayer(scoped_ptr<Scrollbar>(fake_scrollbar).Pass(), | 27 : PaintedScrollbarLayer(scoped_ptr<Scrollbar>(fake_scrollbar).Pass(), |
27 scrolling_layer_id), | 28 scrolling_layer_id), |
28 update_count_(0), | 29 update_count_(0), |
(...skipping 18 matching lines...) Expand all Loading... |
47 ++push_properties_count_; | 48 ++push_properties_count_; |
48 } | 49 } |
49 | 50 |
50 scoped_ptr<base::AutoReset<bool> > | 51 scoped_ptr<base::AutoReset<bool> > |
51 FakePaintedScrollbarLayer::IgnoreSetNeedsCommit() { | 52 FakePaintedScrollbarLayer::IgnoreSetNeedsCommit() { |
52 return make_scoped_ptr( | 53 return make_scoped_ptr( |
53 new base::AutoReset<bool>(&ignore_set_needs_commit_, true)); | 54 new base::AutoReset<bool>(&ignore_set_needs_commit_, true)); |
54 } | 55 } |
55 | 56 |
56 } // namespace cc | 57 } // namespace cc |
OLD | NEW |