OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/layers/tiled_layer.h" | 5 #include "cc/layers/tiled_layer.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 | 75 |
76 private: | 76 private: |
77 SynchronousOutputSurfaceLayerTreeHost( | 77 SynchronousOutputSurfaceLayerTreeHost( |
78 LayerTreeHostClient* client, | 78 LayerTreeHostClient* client, |
79 SharedBitmapManager* manager, | 79 SharedBitmapManager* manager, |
80 const LayerTreeSettings& settings, | 80 const LayerTreeSettings& settings, |
81 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) | 81 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) |
82 : LayerTreeHost(client, manager, NULL, settings), | 82 : LayerTreeHost(client, manager, NULL, settings), |
83 output_surface_created_(false) { | 83 output_surface_created_(false) { |
84 LayerTreeHost::InitializeThreaded(base::MessageLoopProxy::current(), | 84 LayerTreeHost::InitializeThreaded(base::MessageLoopProxy::current(), |
85 impl_task_runner); | 85 impl_task_runner, |
| 86 nullptr); |
86 } | 87 } |
87 | 88 |
88 bool output_surface_created_; | 89 bool output_surface_created_; |
89 base::RunLoop run_loop_; | 90 base::RunLoop run_loop_; |
90 }; | 91 }; |
91 | 92 |
92 class TiledLayerTest : public testing::Test { | 93 class TiledLayerTest : public testing::Test { |
93 public: | 94 public: |
94 TiledLayerTest() | 95 TiledLayerTest() |
95 : proxy_(nullptr), | 96 : proxy_(nullptr), |
(...skipping 1655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1751 | 1752 |
1752 // Rounding leads to an extra pixel. | 1753 // Rounding leads to an extra pixel. |
1753 gfx::Rect expanded_layer_rect(layer_rect); | 1754 gfx::Rect expanded_layer_rect(layer_rect); |
1754 expanded_layer_rect.set_height(32); | 1755 expanded_layer_rect.set_height(32); |
1755 EXPECT_RECT_EQ(expanded_layer_rect, | 1756 EXPECT_RECT_EQ(expanded_layer_rect, |
1756 layer->tracking_layer_painter()->PaintedRect()); | 1757 layer->tracking_layer_painter()->PaintedRect()); |
1757 } | 1758 } |
1758 | 1759 |
1759 } // namespace | 1760 } // namespace |
1760 } // namespace cc | 1761 } // namespace cc |
OLD | NEW |