| 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 2857 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2868 } | 2868 } |
| 2869 | 2869 |
| 2870 const Vector<RefPtr<FrameView> >::iterator end = frameViews.end(); | 2870 const Vector<RefPtr<FrameView> >::iterator end = frameViews.end(); |
| 2871 for (Vector<RefPtr<FrameView> >::iterator it = frameViews.begin(); it != end
; ++it) | 2871 for (Vector<RefPtr<FrameView> >::iterator it = frameViews.begin(); it != end
; ++it) |
| 2872 (*it)->updateLayoutAndStyleIfNeededRecursive(); | 2872 (*it)->updateLayoutAndStyleIfNeededRecursive(); |
| 2873 | 2873 |
| 2874 // When an <iframe> gets composited, it triggers an extra style recalc in it
s containing FrameView. | 2874 // When an <iframe> gets composited, it triggers an extra style recalc in it
s containing FrameView. |
| 2875 // To avoid pushing an invalid tree for display, we have to check for this c
ase and do another | 2875 // To avoid pushing an invalid tree for display, we have to check for this c
ase and do another |
| 2876 // style recalc. The extra style recalc needs to happen after our child <ifr
ames> were updated. | 2876 // style recalc. The extra style recalc needs to happen after our child <ifr
ames> were updated. |
| 2877 // FIXME: We shouldn't be triggering an extra style recalc in the first plac
e. | 2877 // FIXME: We shouldn't be triggering an extra style recalc in the first plac
e. |
| 2878 if (m_frame->document()->hasElementsRequiringLayerUpdate()) { | 2878 if (m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate()) { |
| 2879 m_frame->document()->updateRenderTreeIfNeeded(); | 2879 m_frame->document()->updateRenderTreeIfNeeded(); |
| 2880 | 2880 |
| 2881 if (needsLayout()) | 2881 if (needsLayout()) |
| 2882 layout(); | 2882 layout(); |
| 2883 } | 2883 } |
| 2884 | 2884 |
| 2885 // These asserts ensure that parent frames are clean, when child frames fini
shed updating layout and style. | 2885 // These asserts ensure that parent frames are clean, when child frames fini
shed updating layout and style. |
| 2886 ASSERT(!needsLayout()); | 2886 ASSERT(!needsLayout()); |
| 2887 ASSERT(!m_frame->document()->hasElementsRequiringLayerUpdate()); | 2887 ASSERT(!m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate()); |
| 2888 #ifndef NDEBUG | 2888 #ifndef NDEBUG |
| 2889 m_frame->document()->renderView()->assertRendererLaidOut(); | 2889 m_frame->document()->renderView()->assertRendererLaidOut(); |
| 2890 #endif | 2890 #endif |
| 2891 | 2891 |
| 2892 } | 2892 } |
| 2893 | 2893 |
| 2894 void FrameView::enableAutoSizeMode(bool enable, const IntSize& minSize, const In
tSize& maxSize) | 2894 void FrameView::enableAutoSizeMode(bool enable, const IntSize& minSize, const In
tSize& maxSize) |
| 2895 { | 2895 { |
| 2896 ASSERT(!enable || !minSize.isEmpty()); | 2896 ASSERT(!enable || !minSize.isEmpty()); |
| 2897 ASSERT(minSize.width() <= maxSize.width()); | 2897 ASSERT(minSize.width() <= maxSize.width()); |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3273 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3273 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
| 3274 { | 3274 { |
| 3275 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3275 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3276 if (AXObjectCache* cache = axObjectCache()) { | 3276 if (AXObjectCache* cache = axObjectCache()) { |
| 3277 cache->remove(scrollbar); | 3277 cache->remove(scrollbar); |
| 3278 cache->handleScrollbarUpdate(this); | 3278 cache->handleScrollbarUpdate(this); |
| 3279 } | 3279 } |
| 3280 } | 3280 } |
| 3281 | 3281 |
| 3282 } // namespace WebCore | 3282 } // namespace WebCore |
| OLD | NEW |