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 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 hMode = ScrollbarAlwaysOff; | 594 hMode = ScrollbarAlwaysOff; |
595 } else if (Element* viewportElement = document->viewportDefiningElement(
)) { | 595 } else if (Element* viewportElement = document->viewportDefiningElement(
)) { |
596 if (RenderObject* viewportRenderer = viewportElement->renderer()) { | 596 if (RenderObject* viewportRenderer = viewportElement->renderer()) { |
597 if (viewportRenderer->style()) | 597 if (viewportRenderer->style()) |
598 applyOverflowToViewportAndSetRenderer(viewportRenderer, hMod
e, vMode); | 598 applyOverflowToViewportAndSetRenderer(viewportRenderer, hMod
e, vMode); |
599 } | 599 } |
600 } | 600 } |
601 } | 601 } |
602 } | 602 } |
603 | 603 |
| 604 void FrameView::recalcOverflowAfterStyleChange() |
| 605 { |
| 606 RenderView* renderView = this->renderView(); |
| 607 if (!renderView || !renderView->needsOverflowRecalcAfterStyleChange()) |
| 608 return; |
| 609 |
| 610 renderView->recalcOverflowAfterStyleChange(); |
| 611 adjustViewSize(); |
| 612 } |
| 613 |
604 void FrameView::updateCompositingLayersAfterStyleChange() | 614 void FrameView::updateCompositingLayersAfterStyleChange() |
605 { | 615 { |
606 TRACE_EVENT0("webkit", "FrameView::updateCompositingLayersAfterStyleChange")
; | 616 TRACE_EVENT0("webkit", "FrameView::updateCompositingLayersAfterStyleChange")
; |
607 RenderView* renderView = this->renderView(); | 617 RenderView* renderView = this->renderView(); |
608 if (!renderView) | 618 if (!renderView) |
609 return; | 619 return; |
610 | 620 |
611 // If we expect to update compositing after an incipient layout, don't do so
here. | 621 // If we expect to update compositing after an incipient layout, don't do so
here. |
612 if (m_doingPreLayoutStyleUpdate || layoutPending() || renderView->needsLayou
t()) | 622 if (m_doingPreLayoutStyleUpdate || layoutPending() || renderView->needsLayou
t()) |
613 return; | 623 return; |
(...skipping 2629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3243 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3253 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3244 { | 3254 { |
3245 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3255 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3246 if (AXObjectCache* cache = axObjectCache()) { | 3256 if (AXObjectCache* cache = axObjectCache()) { |
3247 cache->remove(scrollbar); | 3257 cache->remove(scrollbar); |
3248 cache->handleScrollbarUpdate(this); | 3258 cache->handleScrollbarUpdate(this); |
3249 } | 3259 } |
3250 } | 3260 } |
3251 | 3261 |
3252 } // namespace WebCore | 3262 } // namespace WebCore |
OLD | NEW |