| 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 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 vMode = ScrollbarAuto; | 580 vMode = ScrollbarAuto; |
| 581 break; | 581 break; |
| 582 default: | 582 default: |
| 583 // Don't set it at all. | 583 // Don't set it at all. |
| 584 ; | 584 ; |
| 585 } | 585 } |
| 586 } | 586 } |
| 587 | 587 |
| 588 void FrameView::calculateScrollbarModesForLayout(ScrollbarMode& hMode, Scrollbar
Mode& vMode, ScrollbarModesCalculationStrategy strategy) | 588 void FrameView::calculateScrollbarModesForLayout(ScrollbarMode& hMode, Scrollbar
Mode& vMode, ScrollbarModesCalculationStrategy strategy) |
| 589 { | 589 { |
| 590 // FIXME: How do we handle this for OOPI? | 590 const HTMLFrameOwnerElement* ownerElement = m_frame->deprecatedLocalOwner(); |
| 591 const HTMLFrameOwnerElement* owner = m_frame->deprecatedLocalOwner(); | 591 if (ownerElement && (ownerElement->scrollingMode() == ScrollbarAlwaysOff)) { |
| 592 if (owner && (owner->scrollingMode() == ScrollbarAlwaysOff)) { | |
| 593 hMode = ScrollbarAlwaysOff; | 592 hMode = ScrollbarAlwaysOff; |
| 594 vMode = ScrollbarAlwaysOff; | 593 vMode = ScrollbarAlwaysOff; |
| 595 return; | 594 return; |
| 595 } |
| 596 if (!ownerElement && m_frame->owner() && (m_frame->owner()->scrollingMode()
== ScrollbarAlwaysOff)) { |
| 597 hMode = ScrollbarAlwaysOff; |
| 598 vMode = ScrollbarAlwaysOff; |
| 599 return; |
| 596 } | 600 } |
| 597 | 601 |
| 598 if (m_canHaveScrollbars || strategy == RulesFromWebContentOnly) { | 602 if (m_canHaveScrollbars || strategy == RulesFromWebContentOnly) { |
| 599 hMode = ScrollbarAuto; | 603 hMode = ScrollbarAuto; |
| 600 vMode = ScrollbarAuto; | 604 vMode = ScrollbarAuto; |
| 601 } else { | 605 } else { |
| 602 hMode = ScrollbarAlwaysOff; | 606 hMode = ScrollbarAlwaysOff; |
| 603 vMode = ScrollbarAlwaysOff; | 607 vMode = ScrollbarAlwaysOff; |
| 604 } | 608 } |
| 605 | 609 |
| (...skipping 3360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3966 | 3970 |
| 3967 if (!graphicsLayer) | 3971 if (!graphicsLayer) |
| 3968 return; | 3972 return; |
| 3969 | 3973 |
| 3970 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL
ayoutObject(), paintInvalidationContainer, viewRect); | 3974 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL
ayoutObject(), paintInvalidationContainer, viewRect); |
| 3971 | 3975 |
| 3972 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web
Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing
IntRect(viewRect))); | 3976 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web
Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing
IntRect(viewRect))); |
| 3973 } | 3977 } |
| 3974 | 3978 |
| 3975 } // namespace blink | 3979 } // namespace blink |
| OLD | NEW |