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

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

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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
« no previous file with comments | « cc/trees/single_thread_proxy.cc ('k') | examples/bitmap_uploader/bitmap_uploader.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/thread_proxy.h" 5 #include "cc/trees/thread_proxy.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 TRACE_EVENT0("cc", "ThreadProxy::InitializeImplOnImplThread"); 1164 TRACE_EVENT0("cc", "ThreadProxy::InitializeImplOnImplThread");
1165 DCHECK(IsImplThread()); 1165 DCHECK(IsImplThread());
1166 impl().layer_tree_host_impl = 1166 impl().layer_tree_host_impl =
1167 layer_tree_host()->CreateLayerTreeHostImpl(this); 1167 layer_tree_host()->CreateLayerTreeHostImpl(this);
1168 SchedulerSettings scheduler_settings(layer_tree_host()->settings()); 1168 SchedulerSettings scheduler_settings(layer_tree_host()->settings());
1169 impl().scheduler = Scheduler::Create( 1169 impl().scheduler = Scheduler::Create(
1170 this, 1170 this,
1171 scheduler_settings, 1171 scheduler_settings,
1172 impl().layer_tree_host_id, 1172 impl().layer_tree_host_id,
1173 ImplThreadTaskRunner(), 1173 ImplThreadTaskRunner(),
1174 base::PowerMonitor::Get(),
1175 impl().external_begin_frame_source.Pass()); 1174 impl().external_begin_frame_source.Pass());
1176 impl().scheduler->SetVisible(impl().layer_tree_host_impl->visible()); 1175 impl().scheduler->SetVisible(impl().layer_tree_host_impl->visible());
1177 impl_thread_weak_ptr_ = impl().weak_factory.GetWeakPtr(); 1176 impl_thread_weak_ptr_ = impl().weak_factory.GetWeakPtr();
1178 completion->Signal(); 1177 completion->Signal();
1179 } 1178 }
1180 1179
1181 void ThreadProxy::DeleteContentsTexturesOnImplThread( 1180 void ThreadProxy::DeleteContentsTexturesOnImplThread(
1182 CompletionEvent* completion) { 1181 CompletionEvent* completion) {
1183 TRACE_EVENT0("cc", "ThreadProxy::DeleteContentsTexturesOnImplThread"); 1182 TRACE_EVENT0("cc", "ThreadProxy::DeleteContentsTexturesOnImplThread");
1184 DCHECK(IsImplThread()); 1183 DCHECK(IsImplThread());
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1389 } 1388 }
1390 1389
1391 void ThreadProxy::DidCompletePageScaleAnimationOnImplThread() { 1390 void ThreadProxy::DidCompletePageScaleAnimationOnImplThread() {
1392 DCHECK(IsImplThread()); 1391 DCHECK(IsImplThread());
1393 Proxy::MainThreadTaskRunner()->PostTask( 1392 Proxy::MainThreadTaskRunner()->PostTask(
1394 FROM_HERE, base::Bind(&ThreadProxy::DidCompletePageScaleAnimation, 1393 FROM_HERE, base::Bind(&ThreadProxy::DidCompletePageScaleAnimation,
1395 main_thread_weak_ptr_)); 1394 main_thread_weak_ptr_));
1396 } 1395 }
1397 1396
1398 } // namespace cc 1397 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/single_thread_proxy.cc ('k') | examples/bitmap_uploader/bitmap_uploader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698