Source/WebCore/ChangeLog

 12013-11-23 Robert Hogan <robert@webkit.org>
 2
 3 Remove code now unnecessary after r159575
 4 https://bugs.webkit.org/show_bug.cgi?id=124809
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 Covered by existing tests fast/block/margin-collapse/self-collapsing-block-with-float*
 9
 10 * rendering/line/LineBreaker.cpp:
 11 (WebCore::LineBreaker::skipLeadingWhitespace):
 12
1132013-11-21 Robert Hogan <robert@webkit.org>
214
315 Ensure future layouts use the correct linebox layout path when adding a float

Source/WebCore/rendering/line/LineBreaker.cpp

@@void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo&
6464 resolver.runs().addRun(new BidiRun(0, 1, object, resolver.context(), resolver.dir()));
6565 lineInfo.incrementRunsFromLeadingWhitespace();
6666 }
67  } else if (object.isFloating()) {
68  // The top margin edge of a self-collapsing block that clears a float intrudes up into it by the height of the margin,
69  // so in order to place this first child float at the top content edge of the self-collapsing block add the margin back in before placement.
70  LayoutUnit marginOffset = (!object.previousSibling() && m_block.isSelfCollapsingBlock() && m_block.style().clear() && m_block.getClearDelta(m_block, LayoutUnit())) ? m_block.collapsedMarginBeforeForChild(m_block) : LayoutUnit();
71  LayoutUnit oldLogicalHeight = m_block.logicalHeight();
72  m_block.setLogicalHeight(oldLogicalHeight + marginOffset);
 67 } else if (object.isFloating())
7368 m_block.positionNewFloatOnLine(m_block.insertFloatingObject(toRenderBox(object)), lastFloatFromPreviousLine, lineInfo, width);
74  m_block.setLogicalHeight(oldLogicalHeight);
75  } else if (object.isText() && object.style().hasTextCombine() && object.isCombineText() && !toRenderCombineText(object).isCombined()) {
 69 else if (object.isText() && object.style().hasTextCombine() && object.isCombineText() && !toRenderCombineText(object).isCombined()) {
7670 toRenderCombineText(object).combineText();
7771 if (toRenderCombineText(object).isCombined())
7872 continue;