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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 | 76 |
77 private: | 77 private: |
78 SynchronousOutputSurfaceLayerTreeHost( | 78 SynchronousOutputSurfaceLayerTreeHost( |
79 LayerTreeHostClient* client, | 79 LayerTreeHostClient* client, |
80 SharedBitmapManager* manager, | 80 SharedBitmapManager* manager, |
81 const LayerTreeSettings& settings, | 81 const LayerTreeSettings& settings, |
82 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) | 82 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) |
83 : LayerTreeHost(client, manager, NULL, settings), | 83 : LayerTreeHost(client, manager, NULL, settings), |
84 output_surface_created_(false) { | 84 output_surface_created_(false) { |
85 LayerTreeHost::InitializeThreaded(base::MessageLoopProxy::current(), | 85 LayerTreeHost::InitializeThreaded(base::MessageLoopProxy::current(), |
86 impl_task_runner); | 86 impl_task_runner, |
| 87 nullptr); |
87 } | 88 } |
88 | 89 |
89 bool output_surface_created_; | 90 bool output_surface_created_; |
90 base::RunLoop run_loop_; | 91 base::RunLoop run_loop_; |
91 }; | 92 }; |
92 | 93 |
93 class TiledLayerTest : public testing::Test { | 94 class TiledLayerTest : public testing::Test { |
94 public: | 95 public: |
95 TiledLayerTest() | 96 TiledLayerTest() |
96 : proxy_(nullptr), | 97 : proxy_(nullptr), |
(...skipping 1658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1755 | 1756 |
1756 // Rounding leads to an extra pixel. | 1757 // Rounding leads to an extra pixel. |
1757 gfx::Rect expanded_layer_rect(layer_rect); | 1758 gfx::Rect expanded_layer_rect(layer_rect); |
1758 expanded_layer_rect.set_height(32); | 1759 expanded_layer_rect.set_height(32); |
1759 EXPECT_RECT_EQ(expanded_layer_rect, | 1760 EXPECT_RECT_EQ(expanded_layer_rect, |
1760 layer->tracking_layer_painter()->PaintedRect()); | 1761 layer->tracking_layer_painter()->PaintedRect()); |
1761 } | 1762 } |
1762 | 1763 |
1763 } // namespace | 1764 } // namespace |
1764 } // namespace cc | 1765 } // namespace cc |
OLD | NEW |