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

Side by Side Diff: third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp

Issue 1950243005: Communicate MT changes to impl-only scroll offset animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: attempt to fix rebase issue Created 4 years, 7 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 /* 1 /*
2 * Copyright (c) 2011, Google Inc. All rights reserved. 2 * Copyright (c) 2011, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 m_runState = RunState::RunningOnCompositor; 260 m_runState = RunState::RunningOnCompositor;
261 m_compositorAnimationId = animationId; 261 m_compositorAnimationId = animationId;
262 m_compositorAnimationGroupId = animationGroupId; 262 m_compositorAnimationGroupId = animationGroupId;
263 } 263 }
264 264
265 return sentToCompositor; 265 return sentToCompositor;
266 } 266 }
267 267
268 void ScrollAnimator::updateCompositorAnimations() 268 void ScrollAnimator::updateCompositorAnimations()
269 { 269 {
270 ScrollAnimatorCompositorCoordinator::updateCompositorAnimations();
270 if (m_runState == RunState::PostAnimationCleanup) { 271 if (m_runState == RunState::PostAnimationCleanup) {
271 postAnimationCleanupAndReset(); 272 postAnimationCleanupAndReset();
272 return; 273 return;
273 } 274 }
274 275
275 if (m_compositorAnimationId && m_runState != RunState::RunningOnCompositor 276 if (m_compositorAnimationId && m_runState != RunState::RunningOnCompositor
276 && m_runState != RunState::RunningOnCompositorButNeedsUpdate 277 && m_runState != RunState::RunningOnCompositorButNeedsUpdate
277 && m_runState != RunState::WaitingToCancelOnCompositorButNewScroll) { 278 && m_runState != RunState::WaitingToCancelOnCompositorButNewScroll) {
278 // If the current run state is WaitingToSendToCompositor but we have a 279 // If the current run state is WaitingToSendToCompositor but we have a
279 // non-zero compositor animation id, there's a currently running 280 // non-zero compositor animation id, there's a currently running
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 } 427 }
427 return true; 428 return true;
428 } 429 }
429 430
430 DEFINE_TRACE(ScrollAnimator) 431 DEFINE_TRACE(ScrollAnimator)
431 { 432 {
432 ScrollAnimatorBase::trace(visitor); 433 ScrollAnimatorBase::trace(visitor);
433 } 434 }
434 435
435 } // namespace blink 436 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698