| 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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 { | 372 { |
| 373 return layerForScrollCorner(); | 373 return layerForScrollCorner(); |
| 374 } | 374 } |
| 375 | 375 |
| 376 void ScrollableArea::serviceScrollAnimations() | 376 void ScrollableArea::serviceScrollAnimations() |
| 377 { | 377 { |
| 378 if (ScrollAnimator* scrollAnimator = existingScrollAnimator()) | 378 if (ScrollAnimator* scrollAnimator = existingScrollAnimator()) |
| 379 scrollAnimator->serviceScrollAnimations(); | 379 scrollAnimator->serviceScrollAnimations(); |
| 380 } | 380 } |
| 381 | 381 |
| 382 IntRect ScrollableArea::visibleContentRect(VisibleContentRectIncludesScrollbars
scrollbarInclusion) const | 382 IntRect ScrollableArea::visibleContentRect(IncludeScrollbarsInRect scrollbarIncl
usion) const |
| 383 { | 383 { |
| 384 int verticalScrollbarWidth = 0; | 384 int verticalScrollbarWidth = 0; |
| 385 int horizontalScrollbarHeight = 0; | 385 int horizontalScrollbarHeight = 0; |
| 386 | 386 |
| 387 if (scrollbarInclusion == IncludeScrollbars) { | 387 if (scrollbarInclusion == IncludeScrollbars) { |
| 388 if (Scrollbar* verticalBar = verticalScrollbar()) | 388 if (Scrollbar* verticalBar = verticalScrollbar()) |
| 389 verticalScrollbarWidth = !verticalBar->isOverlayScrollbar() ? vertic
alBar->width() : 0; | 389 verticalScrollbarWidth = !verticalBar->isOverlayScrollbar() ? vertic
alBar->width() : 0; |
| 390 if (Scrollbar* horizontalBar = horizontalScrollbar()) | 390 if (Scrollbar* horizontalBar = horizontalScrollbar()) |
| 391 horizontalScrollbarHeight = !horizontalBar->isOverlayScrollbar() ? h
orizontalBar->height() : 0; | 391 horizontalScrollbarHeight = !horizontalBar->isOverlayScrollbar() ? h
orizontalBar->height() : 0; |
| 392 } | 392 } |
| (...skipping 18 matching lines...) Expand all Loading... |
| 411 { | 411 { |
| 412 return scrollSize(orientation); | 412 return scrollSize(orientation); |
| 413 } | 413 } |
| 414 | 414 |
| 415 float ScrollableArea::pixelStep(ScrollbarOrientation) const | 415 float ScrollableArea::pixelStep(ScrollbarOrientation) const |
| 416 { | 416 { |
| 417 return 1; | 417 return 1; |
| 418 } | 418 } |
| 419 | 419 |
| 420 } // namespace WebCore | 420 } // namespace WebCore |
| OLD | NEW |