Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 1807363002: Remove lifecycle rewinding in FrameView::scheduleRelayout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1781 matching lines...) Expand 10 before | Expand all | Expand 10 after
1792 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Invali dateLayout", TRACE_EVENT_SCOPE_THREAD, "data", InspectorInvalidateLayoutEvent::d ata(m_frame.get())); 1792 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Invali dateLayout", TRACE_EVENT_SCOPE_THREAD, "data", InspectorInvalidateLayoutEvent::d ata(m_frame.get()));
1793 1793
1794 clearLayoutSubtreeRootsAndMarkContainingBlocks(); 1794 clearLayoutSubtreeRootsAndMarkContainingBlocks();
1795 1795
1796 if (m_hasPendingLayout) 1796 if (m_hasPendingLayout)
1797 return; 1797 return;
1798 m_hasPendingLayout = true; 1798 m_hasPendingLayout = true;
1799 1799
1800 if (!shouldThrottleRendering()) 1800 if (!shouldThrottleRendering())
1801 page()->animator().scheduleVisualUpdate(m_frame.get()); 1801 page()->animator().scheduleVisualUpdate(m_frame.get());
1802 // TODO(chrishtr): this is dangerous and probably incorrect, since layout ca n be rescheduled during
1803 // the lifecycle in cases such as change of containing block chain. Remove i t.
1804 lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean);
1805 } 1802 }
1806 1803
1807 void FrameView::scheduleRelayoutOfSubtree(LayoutObject* relayoutRoot) 1804 void FrameView::scheduleRelayoutOfSubtree(LayoutObject* relayoutRoot)
1808 { 1805 {
1809 ASSERT(m_frame->view() == this); 1806 ASSERT(m_frame->view() == this);
1810 1807
1811 // FIXME: Should this call shouldScheduleLayout instead? 1808 // FIXME: Should this call shouldScheduleLayout instead?
1812 if (!m_frame->document()->isActive()) 1809 if (!m_frame->document()->isActive())
1813 return; 1810 return;
1814 1811
(...skipping 2283 matching lines...) Expand 10 before | Expand all | Expand 10 after
4098 return m_hiddenForThrottling && m_crossOriginForThrottling; 4095 return m_hiddenForThrottling && m_crossOriginForThrottling;
4099 } 4096 }
4100 4097
4101 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4098 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4102 { 4099 {
4103 ASSERT(layoutView()); 4100 ASSERT(layoutView());
4104 return *layoutView(); 4101 return *layoutView();
4105 } 4102 }
4106 4103
4107 } // namespace blink 4104 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698