| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 m_block.placeNewFloats(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 = EClear::kNone; |
| 57 } | 57 } |
| 58 | 58 |
| 59 InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, | 59 InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, |
| 60 LineInfo& lineInfo, | 60 LineInfo& lineInfo, |
| 61 LayoutTextInfo& layoutTextInfo, | 61 LayoutTextInfo& layoutTextInfo, |
| 62 WordMeasurements& wordMeasurements) { | 62 WordMeasurements& wordMeasurements) { |
| 63 reset(); | 63 reset(); |
| 64 | 64 |
| 65 ASSERT(resolver.position().root() == m_block); | 65 ASSERT(resolver.position().root() == m_block); |
| 66 | 66 |
| (...skipping 44 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 |