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

Side by Side Diff: cc/animation/animation_host.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
« no previous file with comments | « cc/animation/animation_host.h ('k') | cc/animation/animation_player.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/animation/animation_host.h" 5 #include "cc/animation/animation_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "cc/animation/animation_delegate.h" 9 #include "cc/animation/animation_delegate.h"
10 #include "cc/animation/animation_id_provider.h" 10 #include "cc/animation/animation_id_provider.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 return; 237 return;
238 238
239 mutator_host_client_ = client; 239 mutator_host_client_ = client;
240 } 240 }
241 241
242 void AnimationHost::SetNeedsCommit() { 242 void AnimationHost::SetNeedsCommit() {
243 DCHECK(mutator_host_client_); 243 DCHECK(mutator_host_client_);
244 mutator_host_client_->SetMutatorsNeedCommit(); 244 mutator_host_client_->SetMutatorsNeedCommit();
245 } 245 }
246 246
247 void AnimationHost::SetNeedsRebuildPropertyTrees() {
248 DCHECK(mutator_host_client_);
249 mutator_host_client_->SetMutatorsNeedRebuildPropertyTrees();
250 }
251
247 void AnimationHost::PushPropertiesTo(AnimationHost* host_impl) { 252 void AnimationHost::PushPropertiesTo(AnimationHost* host_impl) {
248 PushTimelinesToImplThread(host_impl); 253 PushTimelinesToImplThread(host_impl);
249 RemoveTimelinesFromImplThread(host_impl); 254 RemoveTimelinesFromImplThread(host_impl);
250 PushPropertiesToImplThread(host_impl); 255 PushPropertiesToImplThread(host_impl);
251 } 256 }
252 257
253 void AnimationHost::PushTimelinesToImplThread(AnimationHost* host_impl) const { 258 void AnimationHost::PushTimelinesToImplThread(AnimationHost* host_impl) const {
254 for (auto& timeline : timelines_) { 259 for (auto& timeline : timelines_) {
255 AnimationTimeline* timeline_impl = 260 AnimationTimeline* timeline_impl =
256 host_impl->GetTimelineById(timeline->id()); 261 host_impl->GetTimelineById(timeline->id());
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 int layer_id, 559 int layer_id,
555 const gfx::Vector2dF& scroll_delta, 560 const gfx::Vector2dF& scroll_delta,
556 const gfx::ScrollOffset& max_scroll_offset, 561 const gfx::ScrollOffset& max_scroll_offset,
557 base::TimeTicks frame_monotonic_time) { 562 base::TimeTicks frame_monotonic_time) {
558 DCHECK(scroll_offset_animations_); 563 DCHECK(scroll_offset_animations_);
559 return scroll_offset_animations_->ScrollAnimationUpdateTarget( 564 return scroll_offset_animations_->ScrollAnimationUpdateTarget(
560 layer_id, scroll_delta, max_scroll_offset, frame_monotonic_time); 565 layer_id, scroll_delta, max_scroll_offset, frame_monotonic_time);
561 } 566 }
562 567
563 } // namespace cc 568 } // namespace cc
OLDNEW
« no previous file with comments | « cc/animation/animation_host.h ('k') | cc/animation/animation_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698