| OLD | NEW |
| 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 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 bool ScrollableArea::hasLayerForVerticalScrollbar() const | 437 bool ScrollableArea::hasLayerForVerticalScrollbar() const |
| 438 { | 438 { |
| 439 return layerForVerticalScrollbar(); | 439 return layerForVerticalScrollbar(); |
| 440 } | 440 } |
| 441 | 441 |
| 442 bool ScrollableArea::hasLayerForScrollCorner() const | 442 bool ScrollableArea::hasLayerForScrollCorner() const |
| 443 { | 443 { |
| 444 return layerForScrollCorner(); | 444 return layerForScrollCorner(); |
| 445 } | 445 } |
| 446 | 446 |
| 447 void ScrollableArea::layerForScrollingDidChange(WebCompositorAnimationTimeline*
timeline) | 447 void ScrollableArea::layerForScrollingDidChange(CompositorAnimationTimeline* tim
eline) |
| 448 { | 448 { |
| 449 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram
maticScrollAnimator()) | 449 if (ProgrammaticScrollAnimator* programmaticScrollAnimator = existingProgram
maticScrollAnimator()) |
| 450 programmaticScrollAnimator->layerForCompositedScrollingDidChange(timelin
e); | 450 programmaticScrollAnimator->layerForCompositedScrollingDidChange(timelin
e); |
| 451 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator()) | 451 if (ScrollAnimatorBase* scrollAnimator = existingScrollAnimator()) |
| 452 scrollAnimator->layerForCompositedScrollingDidChange(timeline); | 452 scrollAnimator->layerForCompositedScrollingDidChange(timeline); |
| 453 } | 453 } |
| 454 | 454 |
| 455 bool ScrollableArea::scheduleAnimation() | 455 bool ScrollableArea::scheduleAnimation() |
| 456 { | 456 { |
| 457 if (HostWindow* window = hostWindow()) { | 457 if (HostWindow* window = hostWindow()) { |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 std::max(0, size.height() - horizontalScrollbarHeight)); | 597 std::max(0, size.height() - horizontalScrollbarHeight)); |
| 598 } | 598 } |
| 599 | 599 |
| 600 DEFINE_TRACE(ScrollableArea) | 600 DEFINE_TRACE(ScrollableArea) |
| 601 { | 601 { |
| 602 visitor->trace(m_scrollAnimator); | 602 visitor->trace(m_scrollAnimator); |
| 603 visitor->trace(m_programmaticScrollAnimator); | 603 visitor->trace(m_programmaticScrollAnimator); |
| 604 } | 604 } |
| 605 | 605 |
| 606 } // namespace blink | 606 } // namespace blink |
| OLD | NEW |