| 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 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 Loading... |
| 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 |
| OLD | NEW |