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/trees/single_thread_proxy.h" | 5 #include "cc/trees/single_thread_proxy.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "cc/base/thread.h" | 9 #include "cc/base/thread.h" |
10 #include "cc/output/context_provider.h" | 10 #include "cc/output/context_provider.h" |
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 | 187 |
188 if (layer_tree_host_->contents_texture_manager()) { | 188 if (layer_tree_host_->contents_texture_manager()) { |
189 layer_tree_host_->contents_texture_manager()-> | 189 layer_tree_host_->contents_texture_manager()-> |
190 PushTexturePrioritiesToBackings(); | 190 PushTexturePrioritiesToBackings(); |
191 } | 191 } |
192 layer_tree_host_->BeginCommitOnImplThread(layer_tree_host_impl_.get()); | 192 layer_tree_host_->BeginCommitOnImplThread(layer_tree_host_impl_.get()); |
193 | 193 |
194 scoped_ptr<ResourceUpdateController> update_controller = | 194 scoped_ptr<ResourceUpdateController> update_controller = |
195 ResourceUpdateController::Create( | 195 ResourceUpdateController::Create( |
196 NULL, | 196 NULL, |
197 Proxy::MainThread(), | 197 Proxy::MainThread()->TaskRunner(), |
198 queue.Pass(), | 198 queue.Pass(), |
199 layer_tree_host_impl_->resource_provider()); | 199 layer_tree_host_impl_->resource_provider()); |
200 update_controller->Finalize(); | 200 update_controller->Finalize(); |
201 | 201 |
202 layer_tree_host_->FinishCommitOnImplThread(layer_tree_host_impl_.get()); | 202 layer_tree_host_->FinishCommitOnImplThread(layer_tree_host_impl_.get()); |
203 | 203 |
204 layer_tree_host_impl_->CommitComplete(); | 204 layer_tree_host_impl_->CommitComplete(); |
205 | 205 |
206 #ifndef NDEBUG | 206 #ifndef NDEBUG |
207 // In the single-threaded case, the scroll deltas should never be | 207 // In the single-threaded case, the scroll deltas should never be |
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
486 | 486 |
487 bool SingleThreadProxy::CommitPendingForTesting() { return false; } | 487 bool SingleThreadProxy::CommitPendingForTesting() { return false; } |
488 | 488 |
489 skia::RefPtr<SkPicture> SingleThreadProxy::CapturePicture() { | 489 skia::RefPtr<SkPicture> SingleThreadProxy::CapturePicture() { |
490 // Impl-side painting only. | 490 // Impl-side painting only. |
491 NOTREACHED(); | 491 NOTREACHED(); |
492 return skia::RefPtr<SkPicture>(); | 492 return skia::RefPtr<SkPicture>(); |
493 } | 493 } |
494 | 494 |
495 } // namespace cc | 495 } // namespace cc |
OLD | NEW |