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

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

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Fix copyrights and years. Created 4 years, 10 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 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 bool ScrollableArea::hasLayerForVerticalScrollbar() const 443 bool ScrollableArea::hasLayerForVerticalScrollbar() const
444 { 444 {
445 return layerForVerticalScrollbar(); 445 return layerForVerticalScrollbar();
446 } 446 }
447 447
448 bool ScrollableArea::hasLayerForScrollCorner() const 448 bool ScrollableArea::hasLayerForScrollCorner() const
449 { 449 {
450 return layerForScrollCorner(); 450 return layerForScrollCorner();
451 } 451 }
452 452
453 void ScrollableArea::layerForScrollingDidChange(WebCompositorAnimationTimeline* timeline) 453 void ScrollableArea::layerForScrollingDidChange(CompositorAnimationTimeline* tim eline)
454 { 454 {
455 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator()) 455 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram maticScrollAnimator())
456 programmaticScrollAnimator->layerForCompositedScrollingDidChange(timelin e); 456 programmaticScrollAnimator->layerForCompositedScrollingDidChange(timelin e);
457 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator()) 457 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator())
458 scrollAnimator->layerForCompositedScrollingDidChange(timeline); 458 scrollAnimator->layerForCompositedScrollingDidChange(timeline);
459 } 459 }
460 460
461 bool ScrollableArea::scheduleAnimation() 461 bool ScrollableArea::scheduleAnimation()
462 { 462 {
463 if (HostWindow* window = hostWindow()) { 463 if (HostWindow* window = hostWindow()) {
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 std::max(0, size.height() - horizontalScrollbarHeight)); 603 std::max(0, size.height() - horizontalScrollbarHeight));
604 } 604 }
605 605
606 DEFINE_TRACE(ScrollableArea) 606 DEFINE_TRACE(ScrollableArea)
607 { 607 {
608 visitor->trace(m_scrollAnimator); 608 visitor->trace(m_scrollAnimator);
609 visitor->trace(m_programmaticScrollAnimator); 609 visitor->trace(m_programmaticScrollAnimator);
610 } 610 }
611 611
612 } // namespace blink 612 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollableArea.h ('k') | third_party/WebKit/Source/web/ChromeClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698