| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ight reserved. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ight reserved. |
| 4 * Copyright (C) 2010 Google Inc. All rights reserved. | 4 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 namespace blink { | 28 namespace blink { |
| 29 | 29 |
| 30 void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo&
lineInfo, | 30 void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo&
lineInfo, |
| 31 FloatingObject* lastFloatFromPreviousLine, LineWidth& width) | 31 FloatingObject* lastFloatFromPreviousLine, LineWidth& width) |
| 32 { | 32 { |
| 33 while (!resolver.position().atEnd() && !requiresLineBox(resolver.position(),
lineInfo, LeadingWhitespace)) { | 33 while (!resolver.position().atEnd() && !requiresLineBox(resolver.position(),
lineInfo, LeadingWhitespace)) { |
| 34 LayoutObject* object = resolver.position().object(); | 34 LayoutObject* object = resolver.position().object(); |
| 35 if (object->isOutOfFlowPositioned()) { | 35 if (object->isOutOfFlowPositioned()) { |
| 36 setStaticPositions(m_block, toLayoutBox(object)); | 36 setStaticPositions(m_block, toLayoutBox(object)); |
| 37 if (object->style()->isOriginalDisplayInlineType()) { | 37 if (object->style()->isOriginalDisplayInlineType()) { |
| 38 resolver.runs().addRun(createRun(0, 1, object, resolver)); | 38 resolver.runs().addRun(createRun(0, 1, LineLayoutItem(object), r
esolver)); |
| 39 lineInfo.incrementRunsFromLeadingWhitespace(); | 39 lineInfo.incrementRunsFromLeadingWhitespace(); |
| 40 } | 40 } |
| 41 } else if (object->isFloating()) { | 41 } else if (object->isFloating()) { |
| 42 m_block->positionNewFloatOnLine(*m_block->insertFloatingObject(*toLa
youtBox(object)), lastFloatFromPreviousLine, lineInfo, width); | 42 m_block.positionNewFloatOnLine(*m_block.insertFloatingObject(*toLayo
utBox(object)), lastFloatFromPreviousLine, lineInfo, width); |
| 43 } | 43 } |
| 44 resolver.position().increment(&resolver); | 44 resolver.position().increment(&resolver); |
| 45 } | 45 } |
| 46 resolver.commitExplicitEmbedding(resolver.runs()); | 46 resolver.commitExplicitEmbedding(resolver.runs()); |
| 47 } | 47 } |
| 48 | 48 |
| 49 void LineBreaker::reset() | 49 void LineBreaker::reset() |
| 50 { | 50 { |
| 51 m_positionedObjects.clear(); | 51 m_positionedObjects.clear(); |
| 52 m_hyphenated = false; | 52 m_hyphenated = false; |
| 53 m_clear = CNONE; | 53 m_clear = CNONE; |
| 54 } | 54 } |
| 55 | 55 |
| 56 InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo
& lineInfo, | 56 InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo
& lineInfo, |
| 57 LayoutTextInfo& layoutTextInfo, FloatingObject* lastFloatFromPreviousLine, | 57 LayoutTextInfo& layoutTextInfo, FloatingObject* lastFloatFromPreviousLine, |
| 58 WordMeasurements& wordMeasurements) | 58 WordMeasurements& wordMeasurements) |
| 59 { | 59 { |
| 60 reset(); | 60 reset(); |
| 61 | 61 |
| 62 ASSERT(resolver.position().root() == m_block); | 62 ASSERT(resolver.position().root() == m_block); |
| 63 | 63 |
| 64 bool appliedStartWidth = resolver.position().offset() > 0; | 64 bool appliedStartWidth = resolver.position().offset() > 0; |
| 65 | 65 |
| 66 LineWidth width(*m_block, lineInfo.isFirstLine(), requiresIndent(lineInfo.is
FirstLine(), lineInfo.previousLineBrokeCleanly(), m_block->styleRef())); | 66 LineWidth width(m_block, lineInfo.isFirstLine(), requiresIndent(lineInfo.isF
irstLine(), lineInfo.previousLineBrokeCleanly(), m_block.styleRef())); |
| 67 | 67 |
| 68 skipLeadingWhitespace(resolver, lineInfo, lastFloatFromPreviousLine, width); | 68 skipLeadingWhitespace(resolver, lineInfo, lastFloatFromPreviousLine, width); |
| 69 | 69 |
| 70 if (resolver.position().atEnd()) | 70 if (resolver.position().atEnd()) |
| 71 return resolver.position(); | 71 return resolver.position(); |
| 72 | 72 |
| 73 BreakingContext context(resolver, lineInfo, width, layoutTextInfo, lastFloat
FromPreviousLine, appliedStartWidth, m_block); | 73 BreakingContext context(resolver, lineInfo, width, layoutTextInfo, lastFloat
FromPreviousLine, appliedStartWidth, m_block); |
| 74 | 74 |
| 75 while (context.currentObject()) { | 75 while (context.currentObject()) { |
| 76 context.initializeForCurrentObject(); | 76 context.initializeForCurrentObject(); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 103 | 103 |
| 104 context.increment(); | 104 context.increment(); |
| 105 } | 105 } |
| 106 | 106 |
| 107 context.clearLineBreakIfFitsOnLine(); | 107 context.clearLineBreakIfFitsOnLine(); |
| 108 | 108 |
| 109 return context.handleEndOfLine(); | 109 return context.handleEndOfLine(); |
| 110 } | 110 } |
| 111 | 111 |
| 112 } | 112 } |
| OLD | NEW |