| 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 29 matching lines...) Expand all Loading... |
| 40 : m_block(block) | 40 : m_block(block) |
| 41 { | 41 { |
| 42 reset(); | 42 reset(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 InlineIterator nextLineBreak(InlineBidiResolver&, LineInfo&, RenderTextInfo&
, | 45 InlineIterator nextLineBreak(InlineBidiResolver&, LineInfo&, RenderTextInfo&
, |
| 46 FloatingObject* lastFloatFromPreviousLine, WordMeasurements&); | 46 FloatingObject* lastFloatFromPreviousLine, WordMeasurements&); |
| 47 | 47 |
| 48 bool lineWasHyphenated() { return m_hyphenated; } | 48 bool lineWasHyphenated() { return m_hyphenated; } |
| 49 const Vector<RenderBox*>& positionedObjects() { return m_positionedObjects;
} | 49 const Vector<RenderBox*>& positionedObjects() { return m_positionedObjects;
} |
| 50 EClear clear() { return m_clear; } | |
| 51 private: | 50 private: |
| 52 void reset(); | 51 void reset(); |
| 53 | 52 |
| 54 void skipLeadingWhitespace(InlineBidiResolver&, LineInfo&, FloatingObject* l
astFloatFromPreviousLine, LineWidth&); | 53 void skipLeadingWhitespace(InlineBidiResolver&, LineInfo&, FloatingObject* l
astFloatFromPreviousLine, LineWidth&); |
| 55 | 54 |
| 56 RenderBlockFlow* m_block; | 55 RenderBlockFlow* m_block; |
| 57 bool m_hyphenated; | 56 bool m_hyphenated; |
| 58 EClear m_clear; | |
| 59 Vector<RenderBox*> m_positionedObjects; | 57 Vector<RenderBox*> m_positionedObjects; |
| 60 }; | 58 }; |
| 61 | 59 |
| 62 } | 60 } |
| 63 | 61 |
| 64 #endif // LineBreaker_h | 62 #endif // LineBreaker_h |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 700703002:
Remove more float machinery. (Closed)
Base URL: git@github.com:domokit/mojo.git@master