| 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 25 matching lines...) Expand all Loading... |
| 36 RenderBox* box = toRenderBox(object); | 36 RenderBox* box = toRenderBox(object); |
| 37 setStaticPositions(m_block, box); | 37 setStaticPositions(m_block, box); |
| 38 bool originallyInline = box->style()->isOriginalDisplayInlineType(); | 38 bool originallyInline = box->style()->isOriginalDisplayInlineType(); |
| 39 box->markStaticPositionedBoxForLayout(box->style()->isHorizontalWrit
ingMode(), originallyInline); | 39 box->markStaticPositionedBoxForLayout(box->style()->isHorizontalWrit
ingMode(), originallyInline); |
| 40 if (originallyInline) { | 40 if (originallyInline) { |
| 41 resolver.runs().addRun(createRun(0, 1, object, resolver)); | 41 resolver.runs().addRun(createRun(0, 1, object, resolver)); |
| 42 lineInfo.incrementRunsFromLeadingWhitespace(); | 42 lineInfo.incrementRunsFromLeadingWhitespace(); |
| 43 } | 43 } |
| 44 } else if (object->isFloating()) { | 44 } else if (object->isFloating()) { |
| 45 m_block->positionNewFloatOnLine(m_block->insertFloatingObject(*toRen
derBox(object)), lastFloatFromPreviousLine, lineInfo, width); | 45 m_block->positionNewFloatOnLine(m_block->insertFloatingObject(*toRen
derBox(object)), lastFloatFromPreviousLine, lineInfo, width); |
| 46 } else if (object->isText() && object->style()->hasTextCombine() && obje
ct->isCombineText() && !toRenderCombineText(object)->isCombined()) { | |
| 47 toRenderCombineText(object)->combineText(); | |
| 48 if (toRenderCombineText(object)->isCombined()) | |
| 49 continue; | |
| 50 } | 46 } |
| 51 resolver.position().increment(&resolver); | 47 resolver.position().increment(&resolver); |
| 52 } | 48 } |
| 53 resolver.commitExplicitEmbedding(resolver.runs()); | 49 resolver.commitExplicitEmbedding(resolver.runs()); |
| 54 } | 50 } |
| 55 | 51 |
| 56 void LineBreaker::reset() | 52 void LineBreaker::reset() |
| 57 { | 53 { |
| 58 m_positionedObjects.clear(); | 54 m_positionedObjects.clear(); |
| 59 m_hyphenated = false; | 55 m_hyphenated = false; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 | 106 |
| 111 context.increment(); | 107 context.increment(); |
| 112 } | 108 } |
| 113 | 109 |
| 114 context.clearLineBreakIfFitsOnLine(); | 110 context.clearLineBreakIfFitsOnLine(); |
| 115 | 111 |
| 116 return context.handleEndOfLine(); | 112 return context.handleEndOfLine(); |
| 117 } | 113 } |
| 118 | 114 |
| 119 } | 115 } |
| OLD | NEW |