| 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 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 546 } | 546 } |
| 547 | 547 |
| 548 void FrameView::calculateScrollbarModesFromOverflowStyle(const ComputedStyle* st
yle, ScrollbarMode& hMode, ScrollbarMode& vMode) | 548 void FrameView::calculateScrollbarModesFromOverflowStyle(const ComputedStyle* st
yle, ScrollbarMode& hMode, ScrollbarMode& vMode) |
| 549 { | 549 { |
| 550 hMode = vMode = ScrollbarAuto; | 550 hMode = vMode = ScrollbarAuto; |
| 551 | 551 |
| 552 EOverflow overflowX = style->overflowX(); | 552 EOverflow overflowX = style->overflowX(); |
| 553 EOverflow overflowY = style->overflowY(); | 553 EOverflow overflowY = style->overflowY(); |
| 554 | 554 |
| 555 if (!shouldIgnoreOverflowHidden()) { | 555 if (!shouldIgnoreOverflowHidden()) { |
| 556 if (overflowX == OHIDDEN) | 556 if (overflowX == OverflowHidden) |
| 557 hMode = ScrollbarAlwaysOff; | 557 hMode = ScrollbarAlwaysOff; |
| 558 if (overflowY == OHIDDEN) | 558 if (overflowY == OverflowHidden) |
| 559 vMode = ScrollbarAlwaysOff; | 559 vMode = ScrollbarAlwaysOff; |
| 560 } | 560 } |
| 561 | 561 |
| 562 if (overflowX == OSCROLL) | 562 if (overflowX == OverflowScroll) |
| 563 hMode = ScrollbarAlwaysOn; | 563 hMode = ScrollbarAlwaysOn; |
| 564 if (overflowY == OSCROLL) | 564 if (overflowY == OverflowScroll) |
| 565 vMode = ScrollbarAlwaysOn; | 565 vMode = ScrollbarAlwaysOn; |
| 566 } | 566 } |
| 567 | 567 |
| 568 void FrameView::calculateScrollbarModes(ScrollbarMode& hMode, ScrollbarMode& vMo
de, ScrollbarModesCalculationStrategy strategy) | 568 void FrameView::calculateScrollbarModes(ScrollbarMode& hMode, ScrollbarMode& vMo
de, ScrollbarModesCalculationStrategy strategy) |
| 569 { | 569 { |
| 570 #define RETURN_SCROLLBAR_MODE(mode) \ | 570 #define RETURN_SCROLLBAR_MODE(mode) \ |
| 571 { \ | 571 { \ |
| 572 hMode = vMode = mode; \ | 572 hMode = vMode = mode; \ |
| 573 return; \ | 573 return; \ |
| 574 } | 574 } |
| (...skipping 2558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3133 | 3133 |
| 3134 void FrameView::setScrollbarModes(ScrollbarMode horizontalMode, ScrollbarMode ve
rticalMode, | 3134 void FrameView::setScrollbarModes(ScrollbarMode horizontalMode, ScrollbarMode ve
rticalMode, |
| 3135 bool horizontalLock, bool verticalLock) | 3135 bool horizontalLock, bool verticalLock) |
| 3136 { | 3136 { |
| 3137 bool needsUpdate = false; | 3137 bool needsUpdate = false; |
| 3138 | 3138 |
| 3139 // If the page's overflow setting has disabled scrolling, do not allow anyth
ing to override that setting. | 3139 // If the page's overflow setting has disabled scrolling, do not allow anyth
ing to override that setting. |
| 3140 // http://crbug.com/426447 | 3140 // http://crbug.com/426447 |
| 3141 LayoutObject* viewport = viewportLayoutObject(); | 3141 LayoutObject* viewport = viewportLayoutObject(); |
| 3142 if (viewport && !shouldIgnoreOverflowHidden()) { | 3142 if (viewport && !shouldIgnoreOverflowHidden()) { |
| 3143 if (viewport->style()->overflowX() == OHIDDEN) | 3143 if (viewport->style()->overflowX() == OverflowHidden) |
| 3144 horizontalMode = ScrollbarAlwaysOff; | 3144 horizontalMode = ScrollbarAlwaysOff; |
| 3145 if (viewport->style()->overflowY() == OHIDDEN) | 3145 if (viewport->style()->overflowY() == OverflowHidden) |
| 3146 verticalMode = ScrollbarAlwaysOff; | 3146 verticalMode = ScrollbarAlwaysOff; |
| 3147 } | 3147 } |
| 3148 | 3148 |
| 3149 if (horizontalMode != horizontalScrollbarMode() && !m_horizontalScrollbarLoc
k) { | 3149 if (horizontalMode != horizontalScrollbarMode() && !m_horizontalScrollbarLoc
k) { |
| 3150 m_horizontalScrollbarMode = horizontalMode; | 3150 m_horizontalScrollbarMode = horizontalMode; |
| 3151 needsUpdate = true; | 3151 needsUpdate = true; |
| 3152 } | 3152 } |
| 3153 | 3153 |
| 3154 if (verticalMode != verticalScrollbarMode() && !m_verticalScrollbarLock) { | 3154 if (verticalMode != verticalScrollbarMode() && !m_verticalScrollbarLock) { |
| 3155 m_verticalScrollbarMode = verticalMode; | 3155 m_verticalScrollbarMode = verticalMode; |
| (...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4114 return m_hiddenForThrottling && m_crossOriginForThrottling; | 4114 return m_hiddenForThrottling && m_crossOriginForThrottling; |
| 4115 } | 4115 } |
| 4116 | 4116 |
| 4117 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const | 4117 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const |
| 4118 { | 4118 { |
| 4119 ASSERT(layoutView()); | 4119 ASSERT(layoutView()); |
| 4120 return *layoutView(); | 4120 return *layoutView(); |
| 4121 } | 4121 } |
| 4122 | 4122 |
| 4123 } // namespace blink | 4123 } // namespace blink |
| OLD | NEW |