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

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

Issue 1131833002: [Sketch] Animations: Torpedo the old intrusive animation system. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@scroll
Patch Set: Delete more. Created 5 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
« no previous file with comments | « Source/platform/scroll/ScrollableArea.h ('k') | Source/web/GraphicsLayerFactoryChromium.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 if (!requiresAnimationService) 455 if (!requiresAnimationService)
456 deregisterForAnimation(); 456 deregisterForAnimation();
457 } 457 }
458 458
459 void ScrollableArea::updateCompositorScrollAnimations() 459 void ScrollableArea::updateCompositorScrollAnimations()
460 { 460 {
461 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator()) 461 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator())
462 programmaticScrollAnimator->updateCompositorAnimations(); 462 programmaticScrollAnimator->updateCompositorAnimations();
463 } 463 }
464 464
465 void ScrollableArea::notifyCompositorAnimationFinished(int groupId)
466 {
467 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator())
468 programmaticScrollAnimator->notifyCompositorAnimationFinished(groupId);
469 }
470
471 void ScrollableArea::cancelProgrammaticScrollAnimation() 465 void ScrollableArea::cancelProgrammaticScrollAnimation()
472 { 466 {
473 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator()) 467 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator())
474 programmaticScrollAnimator->cancelAnimation(); 468 programmaticScrollAnimator->cancelAnimation();
475 } 469 }
476 470
477 IntRect ScrollableArea::visibleContentRect(IncludeScrollbarsInRect scrollbarIncl usion) const 471 IntRect ScrollableArea::visibleContentRect(IncludeScrollbarsInRect scrollbarIncl usion) const
478 { 472 {
479 int verticalScrollbarWidth = 0; 473 int verticalScrollbarWidth = 0;
480 int horizontalScrollbarHeight = 0; 474 int horizontalScrollbarHeight = 0;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 { 509 {
516 return scrollSize(orientation); 510 return scrollSize(orientation);
517 } 511 }
518 512
519 float ScrollableArea::pixelStep(ScrollbarOrientation) const 513 float ScrollableArea::pixelStep(ScrollbarOrientation) const
520 { 514 {
521 return 1; 515 return 1;
522 } 516 }
523 517
524 } // namespace blink 518 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/scroll/ScrollableArea.h ('k') | Source/web/GraphicsLayerFactoryChromium.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698