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 2538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2549 frameViews.append(view); | 2549 frameViews.append(view); |
2550 } | 2550 } |
2551 | 2551 |
2552 for (const auto& frameView : frameViews) | 2552 for (const auto& frameView : frameViews) |
2553 frameView->updateStyleAndLayoutIfNeededRecursive(); | 2553 frameView->updateStyleAndLayoutIfNeededRecursive(); |
2554 | 2554 |
2555 // When an <iframe> gets composited, it triggers an extra style recalc in it
s containing FrameView. | 2555 // When an <iframe> gets composited, it triggers an extra style recalc in it
s containing FrameView. |
2556 // To avoid pushing an invalid tree for display, we have to check for this c
ase and do another | 2556 // To avoid pushing an invalid tree for display, we have to check for this c
ase and do another |
2557 // style recalc. The extra style recalc needs to happen after our child <ifr
ames> were updated. | 2557 // style recalc. The extra style recalc needs to happen after our child <ifr
ames> were updated. |
2558 // FIXME: We shouldn't be triggering an extra style recalc in the first plac
e. | 2558 // FIXME: We shouldn't be triggering an extra style recalc in the first plac
e. |
2559 if (m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate()) { | 2559 // if (m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate()) { |
2560 m_frame->document()->updateLayoutTreeIfNeeded(); | 2560 // m_frame->document()->updateLayoutTreeIfNeeded(); |
2561 | 2561 |
2562 if (needsLayout()) | 2562 // if (needsLayout()) |
2563 layout(); | 2563 // layout(); |
2564 } | 2564 // } |
2565 | 2565 |
2566 // These asserts ensure that parent frames are clean, when child frames fini
shed updating layout and style. | 2566 // These asserts ensure that parent frames are clean, when child frames fini
shed updating layout and style. |
2567 ASSERT(!needsLayout()); | 2567 ASSERT(!needsLayout()); |
2568 ASSERT(!m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate()); | |
2569 #if ENABLE(ASSERT) | 2568 #if ENABLE(ASSERT) |
2570 m_frame->document()->layoutView()->assertLaidOut(); | 2569 m_frame->document()->layoutView()->assertLaidOut(); |
2571 #endif | 2570 #endif |
2572 | 2571 |
2573 updateWidgetGeometriesIfNeeded(); | 2572 updateWidgetGeometriesIfNeeded(); |
2574 | 2573 |
2575 if (lifecycle().state() < DocumentLifecycle::LayoutClean) | 2574 if (lifecycle().state() < DocumentLifecycle::LayoutClean) |
2576 lifecycle().advanceTo(DocumentLifecycle::LayoutClean); | 2575 lifecycle().advanceTo(DocumentLifecycle::LayoutClean); |
2577 | 2576 |
2578 // Ensure that we become visually non-empty eventually. | 2577 // Ensure that we become visually non-empty eventually. |
(...skipping 1445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4024 return m_hiddenForThrottling && m_crossOriginForThrottling; | 4023 return m_hiddenForThrottling && m_crossOriginForThrottling; |
4025 } | 4024 } |
4026 | 4025 |
4027 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const | 4026 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const |
4028 { | 4027 { |
4029 ASSERT(layoutView()); | 4028 ASSERT(layoutView()); |
4030 return *layoutView(); | 4029 return *layoutView(); |
4031 } | 4030 } |
4032 | 4031 |
4033 } // namespace blink | 4032 } // namespace blink |
OLD | NEW |