| 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 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 | 576 |
| 577 if (o->isSVGRoot()) { | 577 if (o->isSVGRoot()) { |
| 578 // overflow is ignored in stand-alone SVG documents. | 578 // overflow is ignored in stand-alone SVG documents. |
| 579 if (!toRenderSVGRoot(o)->isEmbeddedThroughFrameContainingSVGDocument()) | 579 if (!toRenderSVGRoot(o)->isEmbeddedThroughFrameContainingSVGDocument()) |
| 580 return; | 580 return; |
| 581 overflowX = OHIDDEN; | 581 overflowX = OHIDDEN; |
| 582 overflowY = OHIDDEN; | 582 overflowY = OHIDDEN; |
| 583 } | 583 } |
| 584 | 584 |
| 585 bool ignoreOverflowHidden = false; | 585 bool ignoreOverflowHidden = false; |
| 586 if (m_frame->page()->settings().ignoreMainFrameOverflowHiddenQuirk() && m_fr
ame->page()->mainFrame() == m_frame) | 586 if (m_frame->settings()->ignoreMainFrameOverflowHiddenQuirk() && m_frame->pa
ge()->mainFrame() == m_frame) |
| 587 ignoreOverflowHidden = true; | 587 ignoreOverflowHidden = true; |
| 588 | 588 |
| 589 switch (overflowX) { | 589 switch (overflowX) { |
| 590 case OHIDDEN: | 590 case OHIDDEN: |
| 591 if (!ignoreOverflowHidden) | 591 if (!ignoreOverflowHidden) |
| 592 hMode = ScrollbarAlwaysOff; | 592 hMode = ScrollbarAlwaysOff; |
| 593 break; | 593 break; |
| 594 case OSCROLL: | 594 case OSCROLL: |
| 595 hMode = ScrollbarAlwaysOn; | 595 hMode = ScrollbarAlwaysOn; |
| 596 break; | 596 break; |
| (...skipping 2089 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2686 | 2686 |
| 2687 if (!scrollableArea->scrollbarsCanBeActive()) | 2687 if (!scrollableArea->scrollbarsCanBeActive()) |
| 2688 continue; | 2688 continue; |
| 2689 | 2689 |
| 2690 scrollableArea->contentAreaWillPaint(); | 2690 scrollableArea->contentAreaWillPaint(); |
| 2691 } | 2691 } |
| 2692 } | 2692 } |
| 2693 | 2693 |
| 2694 bool FrameView::scrollAnimatorEnabled() const | 2694 bool FrameView::scrollAnimatorEnabled() const |
| 2695 { | 2695 { |
| 2696 if (Page* page = m_frame->page()) | 2696 if (m_frame->settings()) |
| 2697 return page->settings().scrollAnimatorEnabled(); | 2697 return m_frame->settings()->scrollAnimatorEnabled(); |
| 2698 return false; | 2698 return false; |
| 2699 } | 2699 } |
| 2700 | 2700 |
| 2701 void FrameView::updateAnnotatedRegions() | 2701 void FrameView::updateAnnotatedRegions() |
| 2702 { | 2702 { |
| 2703 Document* document = m_frame->document(); | 2703 Document* document = m_frame->document(); |
| 2704 if (!document->hasAnnotatedRegions()) | 2704 if (!document->hasAnnotatedRegions()) |
| 2705 return; | 2705 return; |
| 2706 Vector<AnnotatedRegionValue> newRegions; | 2706 Vector<AnnotatedRegionValue> newRegions; |
| 2707 document->renderBox()->collectAnnotatedRegions(newRegions); | 2707 document->renderBox()->collectAnnotatedRegions(newRegions); |
| (...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3443 void FrameView::setLayoutSizeInternal(const IntSize& size) | 3443 void FrameView::setLayoutSizeInternal(const IntSize& size) |
| 3444 { | 3444 { |
| 3445 if (m_layoutSize == size) | 3445 if (m_layoutSize == size) |
| 3446 return; | 3446 return; |
| 3447 | 3447 |
| 3448 m_layoutSize = size; | 3448 m_layoutSize = size; |
| 3449 contentsResized(); | 3449 contentsResized(); |
| 3450 } | 3450 } |
| 3451 | 3451 |
| 3452 } // namespace WebCore | 3452 } // namespace WebCore |
| OLD | NEW |