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. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. |
4 * All right reserved. | 4 * All right reserved. |
5 * Copyright (C) 2010 Google Inc. All rights reserved. | 5 * Copyright (C) 2010 Google Inc. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 25 matching lines...) Expand all Loading... |
36 if (lineLayoutItem.isOutOfFlowPositioned()) { | 36 if (lineLayoutItem.isOutOfFlowPositioned()) { |
37 setStaticPositions(m_block, LineLayoutBox(lineLayoutItem), | 37 setStaticPositions(m_block, LineLayoutBox(lineLayoutItem), |
38 width.indentText()); | 38 width.indentText()); |
39 if (lineLayoutItem.style()->isOriginalDisplayInlineType()) { | 39 if (lineLayoutItem.style()->isOriginalDisplayInlineType()) { |
40 resolver.runs().addRun( | 40 resolver.runs().addRun( |
41 createRun(0, 1, LineLayoutItem(lineLayoutItem), resolver)); | 41 createRun(0, 1, LineLayoutItem(lineLayoutItem), resolver)); |
42 lineInfo.incrementRunsFromLeadingWhitespace(); | 42 lineInfo.incrementRunsFromLeadingWhitespace(); |
43 } | 43 } |
44 } else if (lineLayoutItem.isFloating()) { | 44 } else if (lineLayoutItem.isFloating()) { |
45 m_block.insertFloatingObject(LineLayoutBox(lineLayoutItem)); | 45 m_block.insertFloatingObject(LineLayoutBox(lineLayoutItem)); |
46 m_block.positionNewFloats(m_block.logicalHeight(), &width); | 46 m_block.placeNewFloats(m_block.logicalHeight(), &width); |
47 } | 47 } |
48 resolver.position().increment(&resolver); | 48 resolver.position().increment(&resolver); |
49 } | 49 } |
50 resolver.commitExplicitEmbedding(resolver.runs()); | 50 resolver.commitExplicitEmbedding(resolver.runs()); |
51 } | 51 } |
52 | 52 |
53 void LineBreaker::reset() { | 53 void LineBreaker::reset() { |
54 m_positionedObjects.clear(); | 54 m_positionedObjects.clear(); |
55 m_hyphenated = false; | 55 m_hyphenated = false; |
56 m_clear = ClearNone; | 56 m_clear = ClearNone; |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 | 111 |
112 context.increment(); | 112 context.increment(); |
113 } | 113 } |
114 | 114 |
115 context.clearLineBreakIfFitsOnLine(); | 115 context.clearLineBreakIfFitsOnLine(); |
116 | 116 |
117 return context.handleEndOfLine(); | 117 return context.handleEndOfLine(); |
118 } | 118 } |
119 | 119 |
120 } // namespace blink | 120 } // namespace blink |
OLD | NEW |