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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 proxy_ = layer_tree_host_->proxy(); | 115 proxy_ = layer_tree_host_->proxy(); |
116 resource_manager_ = PrioritizedResourceManager::Create(proxy_); | 116 resource_manager_ = PrioritizedResourceManager::Create(proxy_); |
117 layer_tree_host_->SetLayerTreeHostClientReady(); | 117 layer_tree_host_->SetLayerTreeHostClientReady(); |
118 CHECK(layer_tree_host_->EnsureOutputSurfaceCreated()); | 118 CHECK(layer_tree_host_->EnsureOutputSurfaceCreated()); |
119 layer_tree_host_->SetRootLayer(Layer::Create()); | 119 layer_tree_host_->SetRootLayer(Layer::Create()); |
120 | 120 |
121 CHECK(output_surface_->BindToClient(&output_surface_client_)); | 121 CHECK(output_surface_->BindToClient(&output_surface_client_)); |
122 | 122 |
123 DebugScopedSetImplThreadAndMainThreadBlocked | 123 DebugScopedSetImplThreadAndMainThreadBlocked |
124 impl_thread_and_main_thread_blocked(proxy_); | 124 impl_thread_and_main_thread_blocked(proxy_); |
125 resource_provider_ = ResourceProvider::Create( | 125 resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
126 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1, | 126 shared_bitmap_manager_.get(), |
127 false); | 127 NULL, |
| 128 0, |
| 129 false, |
| 130 1, |
| 131 false); |
128 host_impl_ = make_scoped_ptr( | 132 host_impl_ = make_scoped_ptr( |
129 new FakeLayerTreeHostImpl(proxy_, shared_bitmap_manager_.get())); | 133 new FakeLayerTreeHostImpl(proxy_, shared_bitmap_manager_.get())); |
130 } | 134 } |
131 | 135 |
132 virtual ~TiledLayerTest() { | 136 virtual ~TiledLayerTest() { |
133 ResourceManagerClearAllMemory(resource_manager_.get(), | 137 ResourceManagerClearAllMemory(resource_manager_.get(), |
134 resource_provider_.get()); | 138 resource_provider_.get()); |
135 | 139 |
136 DebugScopedSetImplThreadAndMainThreadBlocked | 140 DebugScopedSetImplThreadAndMainThreadBlocked |
137 impl_thread_and_main_thread_blocked(proxy_); | 141 impl_thread_and_main_thread_blocked(proxy_); |
(...skipping 1673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1811 // Invalidate the entire layer in layer space. When painting, the rect given | 1815 // Invalidate the entire layer in layer space. When painting, the rect given |
1812 // to webkit should match the layer's bounds. | 1816 // to webkit should match the layer's bounds. |
1813 layer->SetNeedsDisplayRect(layer_rect); | 1817 layer->SetNeedsDisplayRect(layer_rect); |
1814 layer->Update(queue_.get(), NULL); | 1818 layer->Update(queue_.get(), NULL); |
1815 | 1819 |
1816 EXPECT_RECT_EQ(layer_rect, layer->tracking_layer_painter()->PaintedRect()); | 1820 EXPECT_RECT_EQ(layer_rect, layer->tracking_layer_painter()->PaintedRect()); |
1817 } | 1821 } |
1818 | 1822 |
1819 } // namespace | 1823 } // namespace |
1820 } // namespace cc | 1824 } // namespace cc |
OLD | NEW |