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

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

Issue 1587073011: Plumb NotifyAnimationAborted from the compositor to blink animation delegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: initialize aborted_ in unittest Created 4 years, 11 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 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 494
495 void ScrollableArea::notifyCompositorAnimationFinished(int groupId) 495 void ScrollableArea::notifyCompositorAnimationFinished(int groupId)
496 { 496 {
497 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator()) 497 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator())
498 programmaticScrollAnimator->notifyCompositorAnimationFinished(groupId); 498 programmaticScrollAnimator->notifyCompositorAnimationFinished(groupId);
499 499
500 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator()) 500 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator())
501 scrollAnimator->notifyCompositorAnimationFinished(groupId); 501 scrollAnimator->notifyCompositorAnimationFinished(groupId);
502 } 502 }
503 503
504 void ScrollableArea::notifyCompositorAnimationAborted(int groupId)
505 {
506 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator())
507 programmaticScrollAnimator->notifyCompositorAnimationAborted(groupId);
508
509 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator())
510 scrollAnimator->notifyCompositorAnimationAborted(groupId);
511 }
512
504 void ScrollableArea::cancelScrollAnimation() 513 void ScrollableArea::cancelScrollAnimation()
505 { 514 {
506 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator()) 515 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator())
507 scrollAnimator->cancelAnimation(); 516 scrollAnimator->cancelAnimation();
508 } 517 }
509 518
510 void ScrollableArea::cancelProgrammaticScrollAnimation() 519 void ScrollableArea::cancelProgrammaticScrollAnimation()
511 { 520 {
512 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator()) 521 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator())
513 programmaticScrollAnimator->cancelAnimation(); 522 programmaticScrollAnimator->cancelAnimation();
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 std::max(0, size.height() - horizontalScrollbarHeight)); 594 std::max(0, size.height() - horizontalScrollbarHeight));
586 } 595 }
587 596
588 DEFINE_TRACE(ScrollableArea) 597 DEFINE_TRACE(ScrollableArea)
589 { 598 {
590 visitor->trace(m_scrollAnimator); 599 visitor->trace(m_scrollAnimator);
591 visitor->trace(m_programmaticScrollAnimator); 600 visitor->trace(m_programmaticScrollAnimator);
592 } 601 }
593 602
594 } // namespace blink 603 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollableArea.h ('k') | third_party/WebKit/Source/web/LinkHighlightImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698