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 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
520 { | 520 { |
521 // Handle the overflow:hidden/scroll case for the body/html elements. WinIE
treats | 521 // Handle the overflow:hidden/scroll case for the body/html elements. WinIE
treats |
522 // overflow:hidden and overflow:scroll on <body> as applying to the document
's | 522 // overflow:hidden and overflow:scroll on <body> as applying to the document
's |
523 // scrollbars. The CSS2.1 draft states that HTML UAs should use the <html>
or <body> element and XML/XHTML UAs should | 523 // scrollbars. The CSS2.1 draft states that HTML UAs should use the <html>
or <body> element and XML/XHTML UAs should |
524 // use the root element. | 524 // use the root element. |
525 | 525 |
526 EOverflow overflowX = o->style()->overflowX(); | 526 EOverflow overflowX = o->style()->overflowX(); |
527 EOverflow overflowY = o->style()->overflowY(); | 527 EOverflow overflowY = o->style()->overflowY(); |
528 | 528 |
529 if (o->isSVGRoot()) { | 529 if (o->isSVGRoot()) { |
530 // overflow is ignored in stand-alone SVG documents. | 530 // FIXME: evaluate if we can allow overflow for these cases too. |
531 if (!toRenderSVGRoot(o)->isEmbeddedThroughFrameContainingSVGDocument()) | 531 // Overflow is always hidden when stand-alone SVG documents are embedded
. |
532 return; | 532 if (toRenderSVGRoot(o)->isEmbeddedThroughFrameContainingSVGDocument()) { |
533 overflowX = OHIDDEN; | 533 overflowX = OHIDDEN; |
534 overflowY = OHIDDEN; | 534 overflowY = OHIDDEN; |
| 535 } |
535 } | 536 } |
536 | 537 |
537 bool ignoreOverflowHidden = false; | 538 bool ignoreOverflowHidden = false; |
538 if (m_frame->settings()->ignoreMainFrameOverflowHiddenQuirk() && m_frame->is
MainFrame()) | 539 if (m_frame->settings()->ignoreMainFrameOverflowHiddenQuirk() && m_frame->is
MainFrame()) |
539 ignoreOverflowHidden = true; | 540 ignoreOverflowHidden = true; |
540 | 541 |
541 switch (overflowX) { | 542 switch (overflowX) { |
542 case OHIDDEN: | 543 case OHIDDEN: |
543 if (!ignoreOverflowHidden) | 544 if (!ignoreOverflowHidden) |
544 hMode = ScrollbarAlwaysOff; | 545 hMode = ScrollbarAlwaysOff; |
(...skipping 2694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3239 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3240 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3240 { | 3241 { |
3241 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3242 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3242 if (AXObjectCache* cache = axObjectCache()) { | 3243 if (AXObjectCache* cache = axObjectCache()) { |
3243 cache->remove(scrollbar); | 3244 cache->remove(scrollbar); |
3244 cache->handleScrollbarUpdate(this); | 3245 cache->handleScrollbarUpdate(this); |
3245 } | 3246 } |
3246 } | 3247 } |
3247 | 3248 |
3248 } // namespace WebCore | 3249 } // namespace WebCore |
OLD | NEW |