| 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 "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "cc/test/fake_scrollbar.h" | 9 #include "cc/test/fake_scrollbar.h" |
| 10 | 10 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 return updated; | 40 return updated; |
| 41 } | 41 } |
| 42 | 42 |
| 43 void FakePaintedScrollbarLayer::PushPropertiesTo(LayerImpl* layer) { | 43 void FakePaintedScrollbarLayer::PushPropertiesTo(LayerImpl* layer) { |
| 44 PaintedScrollbarLayer::PushPropertiesTo(layer); | 44 PaintedScrollbarLayer::PushPropertiesTo(layer); |
| 45 ++push_properties_count_; | 45 ++push_properties_count_; |
| 46 } | 46 } |
| 47 | 47 |
| 48 std::unique_ptr<base::AutoReset<bool>> | 48 std::unique_ptr<base::AutoReset<bool>> |
| 49 FakePaintedScrollbarLayer::IgnoreSetNeedsCommit() { | 49 FakePaintedScrollbarLayer::IgnoreSetNeedsCommit() { |
| 50 return base::WrapUnique( | 50 return base::MakeUnique<base::AutoReset<bool>>(&ignore_set_needs_commit_, |
| 51 new base::AutoReset<bool>(&ignore_set_needs_commit_, true)); | 51 true); |
| 52 } | 52 } |
| 53 | 53 |
| 54 } // namespace cc | 54 } // namespace cc |
| OLD | NEW |