| 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 1779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1790 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Invali
dateLayout", TRACE_EVENT_SCOPE_THREAD, "data", InspectorInvalidateLayoutEvent::d
ata(m_frame.get())); | 1790 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Invali
dateLayout", TRACE_EVENT_SCOPE_THREAD, "data", InspectorInvalidateLayoutEvent::d
ata(m_frame.get())); |
| 1791 | 1791 |
| 1792 clearLayoutSubtreeRootsAndMarkContainingBlocks(); | 1792 clearLayoutSubtreeRootsAndMarkContainingBlocks(); |
| 1793 | 1793 |
| 1794 if (m_hasPendingLayout) | 1794 if (m_hasPendingLayout) |
| 1795 return; | 1795 return; |
| 1796 m_hasPendingLayout = true; | 1796 m_hasPendingLayout = true; |
| 1797 | 1797 |
| 1798 if (!shouldThrottleRendering()) | 1798 if (!shouldThrottleRendering()) |
| 1799 page()->animator().scheduleVisualUpdate(m_frame.get()); | 1799 page()->animator().scheduleVisualUpdate(m_frame.get()); |
| 1800 // TODO(chrishtr): this is dangerous and probably incorrect, since layout ca
n be rescheduled during |
| 1801 // the lifecycle in cases such as change of containing block chain. Remove i
t. |
| 1800 lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean); | 1802 lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean); |
| 1801 } | 1803 } |
| 1802 | 1804 |
| 1803 void FrameView::scheduleRelayoutOfSubtree(LayoutObject* relayoutRoot) | 1805 void FrameView::scheduleRelayoutOfSubtree(LayoutObject* relayoutRoot) |
| 1804 { | 1806 { |
| 1805 ASSERT(m_frame->view() == this); | 1807 ASSERT(m_frame->view() == this); |
| 1806 | 1808 |
| 1807 // FIXME: Should this call shouldScheduleLayout instead? | 1809 // FIXME: Should this call shouldScheduleLayout instead? |
| 1808 if (!m_frame->document()->isActive()) | 1810 if (!m_frame->document()->isActive()) |
| 1809 return; | 1811 return; |
| (...skipping 2302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4112 return m_hiddenForThrottling && m_crossOriginForThrottling; | 4114 return m_hiddenForThrottling && m_crossOriginForThrottling; |
| 4113 } | 4115 } |
| 4114 | 4116 |
| 4115 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const | 4117 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const |
| 4116 { | 4118 { |
| 4117 ASSERT(layoutView()); | 4119 ASSERT(layoutView()); |
| 4118 return *layoutView(); | 4120 return *layoutView(); |
| 4119 } | 4121 } |
| 4120 | 4122 |
| 4121 } // namespace blink | 4123 } // namespace blink |
| OLD | NEW |