Changeset 167718 in webkit
- Timestamp:
- Apr 23, 2014 11:55:43 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r167716 r167718 1 2014-04-23 David Hyatt <hyatt@apple.com> 2 3 [New Multicolumn] Crasher when clearing out a flow thread in multicolumn layout. 4 https://bugs.webkit.org/show_bug.cgi?id=132069 5 6 Reviewed by Dean Jackson. 7 8 * fast/multicol/inline-children-crash-expected.txt: Added. 9 * fast/multicol/inline-children-crash.html: Added. 10 1 11 2014-04-23 Morten Stenshorne <mstensho@opera.com> 2 12 -
trunk/Source/WebCore/ChangeLog
r167717 r167718 1 2014-04-23 David Hyatt <hyatt@apple.com> 2 3 [New Multicolumn] Crasher when clearing out a flow thread in multicolumn layout. 4 https://bugs.webkit.org/show_bug.cgi?id=132069 5 6 Reviewed by Dean Jackson. 7 8 This is imported from a patch Morten did for Blink, but I had to change it a fair 9 bit. deleteLines() is used to handle simple line box layout instead of just calling 10 deleteLineBoxTree. 11 12 I also had to disable the layout state to stop asserts on repaint when the children 13 get moved. Not sure why Blink didn't hit this, but it's simple enough to add a 14 LayoutStateDisabler to stop the assert. 15 16 Added fast/multicol/inline-children-crash.html 17 18 * rendering/RenderMultiColumnFlowThread.cpp: 19 (WebCore::RenderMultiColumnFlowThread::evacuateAndDestroy): 20 1 21 2014-04-23 Andreas Kling <akling@apple.com> 2 22 -
trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp
r167714 r167718 31 31 #include "RenderMultiColumnSet.h" 32 32 #include "RenderMultiColumnSpannerPlaceholder.h" 33 #include "RenderView.h" 33 34 #include "TransformState.h" 34 35 … … 162 163 RenderBlockFlow* multicolContainer = multiColumnBlockFlow(); 163 164 m_beingEvacuated = true; 165 166 // Delete the line box tree. 167 deleteLines(); 168 169 LayoutStateDisabler layoutStateDisabler(&view()); 164 170 165 171 // First promote all children of the flow thread. Before we move them to the flow thread's … … 184 190 while (RenderMultiColumnSet* columnSet = firstMultiColumnSet()) 185 191 columnSet->destroy(); 186 192 187 193 destroy(); 188 194 }
Note: See TracChangeset
for help on using the changeset viewer.