| 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 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 return layerForVerticalScrollbar(); | 412 return layerForVerticalScrollbar(); |
| 413 } | 413 } |
| 414 | 414 |
| 415 bool ScrollableArea::hasLayerForScrollCorner() const | 415 bool ScrollableArea::hasLayerForScrollCorner() const |
| 416 { | 416 { |
| 417 return layerForScrollCorner(); | 417 return layerForScrollCorner(); |
| 418 } | 418 } |
| 419 | 419 |
| 420 bool ScrollableArea::scheduleAnimation() | 420 bool ScrollableArea::scheduleAnimation() |
| 421 { | 421 { |
| 422 WTF_LOG(ScriptedAnimationController, "ScrollableArea::scheduleAnimation: win
dow = %d", | |
| 423 hostWindow() ? 1 : 0); | |
| 424 if (HostWindow* window = hostWindow()) { | 422 if (HostWindow* window = hostWindow()) { |
| 425 window->scheduleAnimation(); | 423 window->scheduleAnimation(); |
| 426 return true; | 424 return true; |
| 427 } | 425 } |
| 428 return false; | 426 return false; |
| 429 } | 427 } |
| 430 | 428 |
| 431 void ScrollableArea::serviceScrollAnimations(double monotonicTime) | 429 void ScrollableArea::serviceScrollAnimations(double monotonicTime) |
| 432 { | 430 { |
| 433 if (ScrollAnimator* scrollAnimator = existingScrollAnimator()) | 431 if (ScrollAnimator* scrollAnimator = existingScrollAnimator()) |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 { | 481 { |
| 484 return scrollSize(orientation); | 482 return scrollSize(orientation); |
| 485 } | 483 } |
| 486 | 484 |
| 487 float ScrollableArea::pixelStep(ScrollbarOrientation) const | 485 float ScrollableArea::pixelStep(ScrollbarOrientation) const |
| 488 { | 486 { |
| 489 return 1; | 487 return 1; |
| 490 } | 488 } |
| 491 | 489 |
| 492 } // namespace blink | 490 } // namespace blink |
| OLD | NEW |