Changeset 32532 in webkit
- Timestamp:
- Apr 24, 2008 9:04:46 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r32528 r32532 1 2008-04-24 Dan Bernstein <mitz@apple.com> 2 3 Reviewed by Dave Hyatt. 4 5 - test for https://bugs.webkit.org/show_bug.cgi?id=18722 6 <rdar://problem/5888360> REGRESSION (3.1 -> TOT): Webkit Nightly Build crashes when visiting i has a hotdog 7 8 * fast/dynamic/float-remove-above-line-expected.txt: Added. 9 * fast/dynamic/float-remove-above-line.html: Added. 10 1 11 2008-04-24 Cameron McCormack <cam@mcc.id.au> 2 12 -
trunk/WebCore/ChangeLog
r32531 r32532 1 2008-04-24 Dan Bernstein <mitz@apple.com> 2 3 Reviewed by Dave Hyatt. 4 5 - fix https://bugs.webkit.org/show_bug.cgi?id=18722 6 <rdar://problem/5888360> REGRESSION (3.1 -> TOT): Webkit Nightly Build crashes when visiting i has a hotdog 7 8 Test: fast/dynamic/float-remove-above-line.html 9 10 * rendering/bidi.cpp: 11 (WebCore::RenderBlock::layoutInlineChildren): Avoid adding floats that 12 do not intrude into the line to its floats vector. When such floats go 13 away, they do not dirty the line (because they do not intersect with it) 14 and having it keep them in its floats vector is what caused the crash. 15 1 16 2008-04-24 Justin Garcia <justin.garcia@apple.com> 2 17 -
trunk/WebCore/rendering/bidi.cpp
r32508 r32532 929 929 bool endLineMatched = false; 930 930 bool checkForEndLineMatch = endLine; 931 int lastHeight = m_height; 931 932 932 933 while (!end.atEnd()) { … … 1059 1060 m_floatingObjects->first(); 1060 1061 for (FloatingObject* f = m_floatingObjects->current(); f; f = m_floatingObjects->next()) { 1061 lastRootBox()->floats().append(f->m_renderer); 1062 if (f->m_bottom > lastHeight) 1063 lastRootBox()->floats().append(f->m_renderer); 1062 1064 ASSERT(f->m_renderer == floats[floatIndex].object); 1063 1065 // If a float's geometry has changed, give up on syncing with clean lines. … … 1069 1071 } 1070 1072 1073 lastHeight = m_height; 1071 1074 sNumMidpoints = 0; 1072 1075 sCurrMidpoint = 0; … … 1120 1123 } else 1121 1124 m_floatingObjects->first(); 1122 for (FloatingObject* f = m_floatingObjects->current(); f; f = m_floatingObjects->next()) 1123 lastRootBox()->floats().append(f->m_renderer); 1125 for (FloatingObject* f = m_floatingObjects->current(); f; f = m_floatingObjects->next()) { 1126 if (f->m_bottom > lastHeight) 1127 lastRootBox()->floats().append(f->m_renderer); 1128 } 1124 1129 lastFloat = m_floatingObjects->last(); 1125 1130 }
Note: See TracChangeset
for help on using the changeset viewer.