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

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

Issue 1413003002: CC Animations: Fix AnimationHost mode integration with Property Trees. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: An attempt to fix weird EXPECT_EQ compilation errors. Created 5 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 unified diff | Download patch
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/layer_tree_host_impl.h" 5 #include "cc/trees/layer_tree_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 3451 matching lines...) Expand 10 before | Expand all | Expand 10 after
3462 return true; 3462 return true;
3463 3463
3464 return false; 3464 return false;
3465 } 3465 }
3466 } 3466 }
3467 3467
3468 void LayerTreeHostImpl::SetMutatorsNeedCommit() { 3468 void LayerTreeHostImpl::SetMutatorsNeedCommit() {
3469 SetNeedsCommit(); 3469 SetNeedsCommit();
3470 } 3470 }
3471 3471
3472 void LayerTreeHostImpl::SetMutatorsNeedRebuildPropertyTrees() {}
3473
3472 void LayerTreeHostImpl::SetTreeLayerFilterMutated( 3474 void LayerTreeHostImpl::SetTreeLayerFilterMutated(
3473 int layer_id, 3475 int layer_id,
3474 LayerTreeImpl* tree, 3476 LayerTreeImpl* tree,
3475 const FilterOperations& filters) { 3477 const FilterOperations& filters) {
3476 if (!tree) 3478 if (!tree)
3477 return; 3479 return;
3478 3480
3479 LayerAnimationValueObserver* layer = tree->LayerById(layer_id); 3481 LayerAnimationValueObserver* layer = tree->LayerById(layer_id);
3480 if (layer) 3482 if (layer)
3481 layer->OnFilterAnimated(filters); 3483 layer->OnFilterAnimated(filters);
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
3596 if (active_tree()) { 3598 if (active_tree()) {
3597 LayerAnimationValueProvider* layer = active_tree()->LayerById(layer_id); 3599 LayerAnimationValueProvider* layer = active_tree()->LayerById(layer_id);
3598 if (layer) 3600 if (layer)
3599 return layer->ScrollOffsetForAnimation(); 3601 return layer->ScrollOffsetForAnimation();
3600 } 3602 }
3601 3603
3602 return gfx::ScrollOffset(); 3604 return gfx::ScrollOffset();
3603 } 3605 }
3604 3606
3605 } // namespace cc 3607 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_impl.h ('k') | cc/trees/layer_tree_host_unittest_animation_timelines.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698