| 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 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 628 int ScrollableArea::documentStep(ScrollbarOrientation orientation) const { | 628 int ScrollableArea::documentStep(ScrollbarOrientation orientation) const { |
| 629 return scrollSize(orientation); | 629 return scrollSize(orientation); |
| 630 } | 630 } |
| 631 | 631 |
| 632 float ScrollableArea::pixelStep(ScrollbarOrientation) const { | 632 float ScrollableArea::pixelStep(ScrollbarOrientation) const { |
| 633 return 1; | 633 return 1; |
| 634 } | 634 } |
| 635 | 635 |
| 636 int ScrollableArea::verticalScrollbarWidth( | 636 int ScrollableArea::verticalScrollbarWidth( |
| 637 OverlayScrollbarClipBehavior behavior) const { | 637 OverlayScrollbarClipBehavior behavior) const { |
| 638 DCHECK_EQ(behavior, IgnorePlatformOverlayScrollbarSize); | 638 DCHECK_EQ(behavior, IgnoreOverlayScrollbarSize); |
| 639 if (Scrollbar* verticalBar = verticalScrollbar()) | 639 if (Scrollbar* verticalBar = verticalScrollbar()) |
| 640 return !verticalBar->isOverlayScrollbar() ? verticalBar->width() : 0; | 640 return !verticalBar->isOverlayScrollbar() ? verticalBar->width() : 0; |
| 641 return 0; | 641 return 0; |
| 642 } | 642 } |
| 643 | 643 |
| 644 int ScrollableArea::horizontalScrollbarHeight( | 644 int ScrollableArea::horizontalScrollbarHeight( |
| 645 OverlayScrollbarClipBehavior behavior) const { | 645 OverlayScrollbarClipBehavior behavior) const { |
| 646 DCHECK_EQ(behavior, IgnorePlatformOverlayScrollbarSize); | 646 DCHECK_EQ(behavior, IgnoreOverlayScrollbarSize); |
| 647 if (Scrollbar* horizontalBar = horizontalScrollbar()) | 647 if (Scrollbar* horizontalBar = horizontalScrollbar()) |
| 648 return !horizontalBar->isOverlayScrollbar() ? horizontalBar->height() : 0; | 648 return !horizontalBar->isOverlayScrollbar() ? horizontalBar->height() : 0; |
| 649 return 0; | 649 return 0; |
| 650 } | 650 } |
| 651 | 651 |
| 652 FloatQuad ScrollableArea::localToVisibleContentQuad(const FloatQuad& quad, | 652 FloatQuad ScrollableArea::localToVisibleContentQuad(const FloatQuad& quad, |
| 653 const LayoutObject*, | 653 const LayoutObject*, |
| 654 unsigned) const { | 654 unsigned) const { |
| 655 FloatQuad result(quad); | 655 FloatQuad result(quad); |
| 656 result.move(-getScrollOffset()); | 656 result.move(-getScrollOffset()); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 667 offset.y() - scrollOrigin().y()); | 667 offset.y() - scrollOrigin().y()); |
| 668 setScrollOffset(newOffset, CompositorScroll); | 668 setScrollOffset(newOffset, CompositorScroll); |
| 669 } | 669 } |
| 670 | 670 |
| 671 DEFINE_TRACE(ScrollableArea) { | 671 DEFINE_TRACE(ScrollableArea) { |
| 672 visitor->trace(m_scrollAnimator); | 672 visitor->trace(m_scrollAnimator); |
| 673 visitor->trace(m_programmaticScrollAnimator); | 673 visitor->trace(m_programmaticScrollAnimator); |
| 674 } | 674 } |
| 675 | 675 |
| 676 } // namespace blink | 676 } // namespace blink |
| OLD | NEW |