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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 2445093002: cc/blimp: Add synchronization for scroll/scale state. (Closed)
Patch Set: Addressed comments Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 5b90fd12c5a679f7c2823aa1327898fe84ed435e..d9f4f5208fb466f085275f533b21368d7a451ebb 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -338,6 +338,11 @@ void LayerTreeHostImpl::BeginCommit() {
void LayerTreeHostImpl::CommitComplete() {
TRACE_EVENT0("cc", "LayerTreeHostImpl::CommitComplete");
+ // Apply any reflected deltas that were not applied during the main frame, if
+ // we use a pending tree.
+ if (!CommitToActiveTree())
aelias_OOO_until_Jul13 2016/10/26 04:04:12 Can you DCHECK(!CommitToActiveTree()) inside the i
Khushal 2016/10/26 19:02:35 I just DCHECKed !IsActiveTree() in that if block i
+ sync_tree()->ApplyReflectedMainFrameState();
+
if (CommitToActiveTree()) {
// We have to activate animations here or "IsActive()" is true on the layers
// but the animations aren't activated yet so they get ignored by

Powered by Google App Engine
This is Rietveld 408576698