| 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 "cc/debug/overdraw_metrics.h" | 10 #include "cc/debug/overdraw_metrics.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 } | 90 } |
| 91 resource_manager->UnlinkAndClearEvictedBackings(); | 91 resource_manager->UnlinkAndClearEvictedBackings(); |
| 92 } | 92 } |
| 93 | 93 |
| 94 void UpdateTextures() { | 94 void UpdateTextures() { |
| 95 DebugScopedSetImplThreadAndMainThreadBlocked | 95 DebugScopedSetImplThreadAndMainThreadBlocked |
| 96 impl_thread_and_main_thread_blocked(proxy_); | 96 impl_thread_and_main_thread_blocked(proxy_); |
| 97 DCHECK(queue_); | 97 DCHECK(queue_); |
| 98 scoped_ptr<ResourceUpdateController> update_controller = | 98 scoped_ptr<ResourceUpdateController> update_controller = |
| 99 ResourceUpdateController::Create(NULL, | 99 ResourceUpdateController::Create(NULL, |
| 100 proxy_->ImplThread(), | 100 NULL, |
| 101 queue_.Pass(), | 101 queue_.Pass(), |
| 102 resource_provider_.get()); | 102 resource_provider_.get()); |
| 103 update_controller->Finalize(); | 103 update_controller->Finalize(); |
| 104 queue_ = make_scoped_ptr(new ResourceUpdateQueue); | 104 queue_ = make_scoped_ptr(new ResourceUpdateQueue); |
| 105 } | 105 } |
| 106 | 106 |
| 107 void LayerPushPropertiesTo(FakeTiledLayer* layer, | 107 void LayerPushPropertiesTo(FakeTiledLayer* layer, |
| 108 FakeTiledLayerImpl* layer_impl) { | 108 FakeTiledLayerImpl* layer_impl) { |
| 109 DebugScopedSetImplThreadAndMainThreadBlocked | 109 DebugScopedSetImplThreadAndMainThreadBlocked |
| 110 impl_thread_and_main_thread_blocked(proxy_); | 110 impl_thread_and_main_thread_blocked(proxy_); |
| (...skipping 1734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1845 // Invalidate the entire layer in layer space. When painting, the rect given | 1845 // Invalidate the entire layer in layer space. When painting, the rect given |
| 1846 // to webkit should match the layer's bounds. | 1846 // to webkit should match the layer's bounds. |
| 1847 layer->SetNeedsDisplayRect(layer_rect); | 1847 layer->SetNeedsDisplayRect(layer_rect); |
| 1848 layer->Update(queue_.get(), 0, NULL); | 1848 layer->Update(queue_.get(), 0, NULL); |
| 1849 | 1849 |
| 1850 EXPECT_RECT_EQ(layer_rect, layer->tracking_layer_painter()->PaintedRect()); | 1850 EXPECT_RECT_EQ(layer_rect, layer->tracking_layer_painter()->PaintedRect()); |
| 1851 } | 1851 } |
| 1852 | 1852 |
| 1853 } // namespace | 1853 } // namespace |
| 1854 } // namespace cc | 1854 } // namespace cc |
| OLD | NEW |