| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 723 void FrameView::calculateScrollbarModesFromOverflowStyle( | 723 void FrameView::calculateScrollbarModesFromOverflowStyle( |
| 724 const ComputedStyle* style, | 724 const ComputedStyle* style, |
| 725 ScrollbarMode& hMode, | 725 ScrollbarMode& hMode, |
| 726 ScrollbarMode& vMode) const { | 726 ScrollbarMode& vMode) const { |
| 727 hMode = vMode = ScrollbarAuto; | 727 hMode = vMode = ScrollbarAuto; |
| 728 | 728 |
| 729 EOverflow overflowX = style->overflowX(); | 729 EOverflow overflowX = style->overflowX(); |
| 730 EOverflow overflowY = style->overflowY(); | 730 EOverflow overflowY = style->overflowY(); |
| 731 | 731 |
| 732 if (!shouldIgnoreOverflowHidden()) { | 732 if (!shouldIgnoreOverflowHidden()) { |
| 733 if (overflowX == EOverflow::Hidden) | 733 if (overflowX == EOverflow::kHidden) |
| 734 hMode = ScrollbarAlwaysOff; | 734 hMode = ScrollbarAlwaysOff; |
| 735 if (overflowY == EOverflow::Hidden) | 735 if (overflowY == EOverflow::kHidden) |
| 736 vMode = ScrollbarAlwaysOff; | 736 vMode = ScrollbarAlwaysOff; |
| 737 } | 737 } |
| 738 | 738 |
| 739 if (overflowX == EOverflow::Scroll) | 739 if (overflowX == EOverflow::kScroll) |
| 740 hMode = ScrollbarAlwaysOn; | 740 hMode = ScrollbarAlwaysOn; |
| 741 if (overflowY == EOverflow::Scroll) | 741 if (overflowY == EOverflow::kScroll) |
| 742 vMode = ScrollbarAlwaysOn; | 742 vMode = ScrollbarAlwaysOn; |
| 743 } | 743 } |
| 744 | 744 |
| 745 void FrameView::calculateScrollbarModes( | 745 void FrameView::calculateScrollbarModes( |
| 746 ScrollbarMode& hMode, | 746 ScrollbarMode& hMode, |
| 747 ScrollbarMode& vMode, | 747 ScrollbarMode& vMode, |
| 748 ScrollbarModesCalculationStrategy strategy) const { | 748 ScrollbarModesCalculationStrategy strategy) const { |
| 749 #define RETURN_SCROLLBAR_MODE(mode) \ | 749 #define RETURN_SCROLLBAR_MODE(mode) \ |
| 750 { \ | 750 { \ |
| 751 hMode = vMode = mode; \ | 751 hMode = vMode = mode; \ |
| (...skipping 3018 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3770 void FrameView::setScrollbarModes(ScrollbarMode horizontalMode, | 3770 void FrameView::setScrollbarModes(ScrollbarMode horizontalMode, |
| 3771 ScrollbarMode verticalMode, | 3771 ScrollbarMode verticalMode, |
| 3772 bool horizontalLock, | 3772 bool horizontalLock, |
| 3773 bool verticalLock) { | 3773 bool verticalLock) { |
| 3774 bool needsUpdate = false; | 3774 bool needsUpdate = false; |
| 3775 | 3775 |
| 3776 // If the page's overflow setting has disabled scrolling, do not allow | 3776 // If the page's overflow setting has disabled scrolling, do not allow |
| 3777 // anything to override that setting, http://crbug.com/426447 | 3777 // anything to override that setting, http://crbug.com/426447 |
| 3778 LayoutObject* viewport = viewportLayoutObject(); | 3778 LayoutObject* viewport = viewportLayoutObject(); |
| 3779 if (viewport && !shouldIgnoreOverflowHidden()) { | 3779 if (viewport && !shouldIgnoreOverflowHidden()) { |
| 3780 if (viewport->style()->overflowX() == EOverflow::Hidden) | 3780 if (viewport->style()->overflowX() == EOverflow::kHidden) |
| 3781 horizontalMode = ScrollbarAlwaysOff; | 3781 horizontalMode = ScrollbarAlwaysOff; |
| 3782 if (viewport->style()->overflowY() == EOverflow::Hidden) | 3782 if (viewport->style()->overflowY() == EOverflow::kHidden) |
| 3783 verticalMode = ScrollbarAlwaysOff; | 3783 verticalMode = ScrollbarAlwaysOff; |
| 3784 } | 3784 } |
| 3785 | 3785 |
| 3786 if (horizontalMode != horizontalScrollbarMode() && | 3786 if (horizontalMode != horizontalScrollbarMode() && |
| 3787 !m_horizontalScrollbarLock) { | 3787 !m_horizontalScrollbarLock) { |
| 3788 m_horizontalScrollbarMode = horizontalMode; | 3788 m_horizontalScrollbarMode = horizontalMode; |
| 3789 needsUpdate = true; | 3789 needsUpdate = true; |
| 3790 } | 3790 } |
| 3791 | 3791 |
| 3792 if (verticalMode != verticalScrollbarMode() && !m_verticalScrollbarLock) { | 3792 if (verticalMode != verticalScrollbarMode() && !m_verticalScrollbarLock) { |
| (...skipping 1302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5095 std::unique_ptr<CompositorAnimationTimeline> timeline) { | 5095 std::unique_ptr<CompositorAnimationTimeline> timeline) { |
| 5096 m_animationTimeline = std::move(timeline); | 5096 m_animationTimeline = std::move(timeline); |
| 5097 } | 5097 } |
| 5098 | 5098 |
| 5099 void FrameView::setAnimationHost( | 5099 void FrameView::setAnimationHost( |
| 5100 std::unique_ptr<CompositorAnimationHost> host) { | 5100 std::unique_ptr<CompositorAnimationHost> host) { |
| 5101 m_animationHost = std::move(host); | 5101 m_animationHost = std::move(host); |
| 5102 } | 5102 } |
| 5103 | 5103 |
| 5104 } // namespace blink | 5104 } // namespace blink |
| OLD | NEW |