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

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

Issue 960873002: Update from https://crrev.com/318214 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/thread_proxy.h ('k') | gin/isolate_holder.cc » ('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 1344 matching lines...) Expand 10 before | Expand all | Expand 10 after
1355 // Notify the the client of this compositor via the output surface. 1355 // Notify the the client of this compositor via the output surface.
1356 // TODO(epenner): Route this to compositor-thread instead of output-surface 1356 // TODO(epenner): Route this to compositor-thread instead of output-surface
1357 // after GTFO refactor of compositor-thread (http://crbug/170828). 1357 // after GTFO refactor of compositor-thread (http://crbug/170828).
1358 if (impl().layer_tree_host_impl->output_surface()) { 1358 if (impl().layer_tree_host_impl->output_surface()) {
1359 impl() 1359 impl()
1360 .layer_tree_host_impl->output_surface() 1360 .layer_tree_host_impl->output_surface()
1361 ->UpdateSmoothnessTakesPriority(priority == SMOOTHNESS_TAKES_PRIORITY); 1361 ->UpdateSmoothnessTakesPriority(priority == SMOOTHNESS_TAKES_PRIORITY);
1362 } 1362 }
1363 } 1363 }
1364 1364
1365 void ThreadProxy::PostDelayedScrollbarFadeOnImplThread( 1365 void ThreadProxy::PostDelayedAnimationTaskOnImplThread(
1366 const base::Closure& start_fade, 1366 const base::Closure& task,
1367 base::TimeDelta delay) { 1367 base::TimeDelta delay) {
1368 Proxy::ImplThreadTaskRunner()->PostDelayedTask(FROM_HERE, start_fade, delay); 1368 Proxy::ImplThreadTaskRunner()->PostDelayedTask(FROM_HERE, task, delay);
1369 } 1369 }
1370 1370
1371 void ThreadProxy::DidActivateSyncTree() { 1371 void ThreadProxy::DidActivateSyncTree() {
1372 TRACE_EVENT0("cc", "ThreadProxy::DidActivateSyncTreeOnImplThread"); 1372 TRACE_EVENT0("cc", "ThreadProxy::DidActivateSyncTreeOnImplThread");
1373 DCHECK(IsImplThread()); 1373 DCHECK(IsImplThread());
1374 1374
1375 if (impl().completion_event_for_commit_held_on_tree_activation) { 1375 if (impl().completion_event_for_commit_held_on_tree_activation) {
1376 TRACE_EVENT_INSTANT0( 1376 TRACE_EVENT_INSTANT0(
1377 "cc", "ReleaseCommitbyActivation", TRACE_EVENT_SCOPE_THREAD); 1377 "cc", "ReleaseCommitbyActivation", TRACE_EVENT_SCOPE_THREAD);
1378 DCHECK(impl().layer_tree_host_impl->settings().impl_side_painting); 1378 DCHECK(impl().layer_tree_host_impl->settings().impl_side_painting);
(...skipping 10 matching lines...) Expand all
1389 } 1389 }
1390 1390
1391 void ThreadProxy::DidCompletePageScaleAnimationOnImplThread() { 1391 void ThreadProxy::DidCompletePageScaleAnimationOnImplThread() {
1392 DCHECK(IsImplThread()); 1392 DCHECK(IsImplThread());
1393 Proxy::MainThreadTaskRunner()->PostTask( 1393 Proxy::MainThreadTaskRunner()->PostTask(
1394 FROM_HERE, base::Bind(&ThreadProxy::DidCompletePageScaleAnimation, 1394 FROM_HERE, base::Bind(&ThreadProxy::DidCompletePageScaleAnimation,
1395 main_thread_weak_ptr_)); 1395 main_thread_weak_ptr_));
1396 } 1396 }
1397 1397
1398 } // namespace cc 1398 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/thread_proxy.h ('k') | gin/isolate_holder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698