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

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

Issue 1739743003: Blink Compositor Animation: Erase old animation system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Exclude histograms.xml Created 4 years, 9 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) 2010, Google Inc. All rights reserved. 2 * Copyright (c) 2010, Google Inc. All rights reserved.
3 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved. 3 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 491
492 void ScrollableArea::updateCompositorScrollAnimations() 492 void ScrollableArea::updateCompositorScrollAnimations()
493 { 493 {
494 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator()) 494 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator())
495 programmaticScrollAnimator->updateCompositorAnimations(); 495 programmaticScrollAnimator->updateCompositorAnimations();
496 496
497 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator()) 497 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator())
498 scrollAnimator->updateCompositorAnimations(); 498 scrollAnimator->updateCompositorAnimations();
499 } 499 }
500 500
501 void ScrollableArea::notifyCompositorAnimationFinished(int groupId)
502 {
503 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator())
504 programmaticScrollAnimator->notifyCompositorAnimationFinished(groupId);
505
506 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator())
507 scrollAnimator->notifyCompositorAnimationFinished(groupId);
508 }
509
510 void ScrollableArea::notifyCompositorAnimationAborted(int groupId)
511 {
512 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator())
513 programmaticScrollAnimator->notifyCompositorAnimationAborted(groupId);
514
515 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator())
516 scrollAnimator->notifyCompositorAnimationAborted(groupId);
517 }
518
519 void ScrollableArea::cancelScrollAnimation() 501 void ScrollableArea::cancelScrollAnimation()
520 { 502 {
521 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator()) 503 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator())
522 scrollAnimator->cancelAnimation(); 504 scrollAnimator->cancelAnimation();
523 } 505 }
524 506
525 void ScrollableArea::cancelProgrammaticScrollAnimation() 507 void ScrollableArea::cancelProgrammaticScrollAnimation()
526 { 508 {
527 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator()) 509 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator())
528 programmaticScrollAnimator->cancelAnimation(); 510 programmaticScrollAnimator->cancelAnimation();
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 std::max(0, size.height() - horizontalScrollbarHeight)); 599 std::max(0, size.height() - horizontalScrollbarHeight));
618 } 600 }
619 601
620 DEFINE_TRACE(ScrollableArea) 602 DEFINE_TRACE(ScrollableArea)
621 { 603 {
622 visitor->trace(m_scrollAnimator); 604 visitor->trace(m_scrollAnimator);
623 visitor->trace(m_programmaticScrollAnimator); 605 visitor->trace(m_programmaticScrollAnimator);
624 } 606 }
625 607
626 } // namespace blink 608 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698