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 | 77 |
78 private: | 78 private: |
79 SynchronousOutputSurfaceLayerTreeHost( | 79 SynchronousOutputSurfaceLayerTreeHost( |
80 LayerTreeHostClient* client, | 80 LayerTreeHostClient* client, |
81 SharedBitmapManager* manager, | 81 SharedBitmapManager* manager, |
82 const LayerTreeSettings& settings, | 82 const LayerTreeSettings& settings, |
83 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) | 83 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) |
84 : LayerTreeHost(client, manager, settings), | 84 : LayerTreeHost(client, manager, settings), |
85 output_surface_created_(false) { | 85 output_surface_created_(false) { |
86 LayerTreeHost::InitializeThreaded(impl_task_runner); | 86 LayerTreeHost::InitializeThreaded(base::MessageLoopProxy::current(), |
| 87 impl_task_runner); |
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_(NULL), | 97 : proxy_(NULL), |
(...skipping 1713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1810 // Invalidate the entire layer in layer space. When painting, the rect given | 1811 // Invalidate the entire layer in layer space. When painting, the rect given |
1811 // to webkit should match the layer's bounds. | 1812 // to webkit should match the layer's bounds. |
1812 layer->SetNeedsDisplayRect(layer_rect); | 1813 layer->SetNeedsDisplayRect(layer_rect); |
1813 layer->Update(queue_.get(), NULL); | 1814 layer->Update(queue_.get(), NULL); |
1814 | 1815 |
1815 EXPECT_RECT_EQ(layer_rect, layer->tracking_layer_painter()->PaintedRect()); | 1816 EXPECT_RECT_EQ(layer_rect, layer->tracking_layer_painter()->PaintedRect()); |
1816 } | 1817 } |
1817 | 1818 |
1818 } // namespace | 1819 } // namespace |
1819 } // namespace cc | 1820 } // namespace cc |
OLD | NEW |