Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Side by Side Diff: cc/trees/single_thread_proxy.cc

Issue 23621021: (not for review yet) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | cc/trees/thread_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/output/context_provider.h" 9 #include "cc/output/context_provider.h"
10 #include "cc/output/output_surface.h" 10 #include "cc/output/output_surface.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 layer_tree_host_->BeginCommitOnImplThread(layer_tree_host_impl_.get()); 206 layer_tree_host_->BeginCommitOnImplThread(layer_tree_host_impl_.get());
207 207
208 scoped_ptr<ResourceUpdateController> update_controller = 208 scoped_ptr<ResourceUpdateController> update_controller =
209 ResourceUpdateController::Create( 209 ResourceUpdateController::Create(
210 NULL, 210 NULL,
211 Proxy::MainThreadTaskRunner(), 211 Proxy::MainThreadTaskRunner(),
212 queue.Pass(), 212 queue.Pass(),
213 layer_tree_host_impl_->resource_provider()); 213 layer_tree_host_impl_->resource_provider());
214 update_controller->Finalize(); 214 update_controller->Finalize();
215 215
216 layer_tree_host_->SetUIResourceEvictionCountToAck(
217 layer_tree_host_impl_->ui_resource_eviction_count());
218
216 layer_tree_host_->FinishCommitOnImplThread(layer_tree_host_impl_.get()); 219 layer_tree_host_->FinishCommitOnImplThread(layer_tree_host_impl_.get());
217 220
218 layer_tree_host_impl_->CommitComplete(); 221 layer_tree_host_impl_->CommitComplete();
219 222
220 #ifndef NDEBUG 223 #ifndef NDEBUG
221 // In the single-threaded case, the scale and scroll deltas should never be 224 // In the single-threaded case, the scale and scroll deltas should never be
222 // touched on the impl layer tree. 225 // touched on the impl layer tree.
223 scoped_ptr<ScrollAndScaleSet> scroll_info = 226 scoped_ptr<ScrollAndScaleSet> scroll_info =
224 layer_tree_host_impl_->ProcessScrollDeltas(); 227 layer_tree_host_impl_->ProcessScrollDeltas();
225 DCHECK(!scroll_info->scrolls.size()); 228 DCHECK(!scroll_info->scrolls.size());
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 void SingleThreadProxy::DidSwapFrame() { 504 void SingleThreadProxy::DidSwapFrame() {
502 if (next_frame_is_newly_committed_frame_) { 505 if (next_frame_is_newly_committed_frame_) {
503 next_frame_is_newly_committed_frame_ = false; 506 next_frame_is_newly_committed_frame_ = false;
504 layer_tree_host_->DidCommitAndDrawFrame(); 507 layer_tree_host_->DidCommitAndDrawFrame();
505 } 508 }
506 } 509 }
507 510
508 bool SingleThreadProxy::CommitPendingForTesting() { return false; } 511 bool SingleThreadProxy::CommitPendingForTesting() { return false; }
509 512
510 } // namespace cc 513 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | cc/trees/thread_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698