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

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

Issue 1906803002: Prevent markContainerChainForLayout to scheduleRelayout() if isInPerformLayout() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: RELEASE_ASSERT to FrameView Created 4 years, 8 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
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 1763 matching lines...) Expand 10 before | Expand all | Expand 10 after
1774 continue; 1774 continue;
1775 } 1775 }
1776 LayoutState layoutState(*root); 1776 LayoutState layoutState(*root);
1777 root->layout(); 1777 root->layout();
1778 } 1778 }
1779 } 1779 }
1780 1780
1781 void FrameView::scheduleRelayout() 1781 void FrameView::scheduleRelayout()
1782 { 1782 {
1783 ASSERT(m_frame->view() == this); 1783 ASSERT(m_frame->view() == this);
1784 RELEASE_ASSERT(!isInPerformLayout());
kojii 2016/04/22 05:29:05 The critical error is to modify m_layoutSubtreeRoo
1784 1785
1785 if (!m_layoutSchedulingEnabled) 1786 if (!m_layoutSchedulingEnabled)
1786 return; 1787 return;
1787 if (!needsLayout()) 1788 if (!needsLayout())
1788 return; 1789 return;
1789 if (!m_frame->document()->shouldScheduleLayout()) 1790 if (!m_frame->document()->shouldScheduleLayout())
1790 return; 1791 return;
1791 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()));
1792 1793
1793 clearLayoutSubtreeRootsAndMarkContainingBlocks(); 1794 clearLayoutSubtreeRootsAndMarkContainingBlocks();
1794 1795
1795 if (m_hasPendingLayout) 1796 if (m_hasPendingLayout)
1796 return; 1797 return;
1797 m_hasPendingLayout = true; 1798 m_hasPendingLayout = true;
1798 1799
1799 if (!shouldThrottleRendering()) 1800 if (!shouldThrottleRendering())
1800 page()->animator().scheduleVisualUpdate(m_frame.get()); 1801 page()->animator().scheduleVisualUpdate(m_frame.get());
1801 } 1802 }
1802 1803
1803 void FrameView::scheduleRelayoutOfSubtree(LayoutObject* relayoutRoot) 1804 void FrameView::scheduleRelayoutOfSubtree(LayoutObject* relayoutRoot)
1804 { 1805 {
1805 ASSERT(m_frame->view() == this); 1806 ASSERT(m_frame->view() == this);
1807 RELEASE_ASSERT(!isInPerformLayout());
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;
1810 1812
1811 LayoutView* layoutView = this->layoutView(); 1813 LayoutView* layoutView = this->layoutView();
1812 if (layoutView && layoutView->needsLayout()) { 1814 if (layoutView && layoutView->needsLayout()) {
1813 if (relayoutRoot) 1815 if (relayoutRoot)
1814 relayoutRoot->markContainerChainForLayout(false); 1816 relayoutRoot->markContainerChainForLayout(false);
1815 return; 1817 return;
(...skipping 2244 matching lines...) Expand 10 before | Expand all | Expand 10 after
4060 return m_hiddenForThrottling && m_crossOriginForThrottling; 4062 return m_hiddenForThrottling && m_crossOriginForThrottling;
4061 } 4063 }
4062 4064
4063 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4065 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4064 { 4066 {
4065 ASSERT(layoutView()); 4067 ASSERT(layoutView());
4066 return *layoutView(); 4068 return *layoutView();
4067 } 4069 }
4068 4070
4069 } // namespace blink 4071 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698