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 * Copyright (C) 2013 Adobe Systems Incorporated. | 5 * Copyright (C) 2013 Adobe Systems Incorporated. |
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 881 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
892 m_lastObject = m_current.object(); | 892 m_lastObject = m_current.object(); |
893 if (m_lastObject->isReplaced() && m_autoWrap && (!m_lastObject->isImage(
) || m_allowImagesToBreak) && (!m_lastObject->isListMarker() || toRenderListMark
er(m_lastObject)->isInside())) { | 893 if (m_lastObject->isReplaced() && m_autoWrap && (!m_lastObject->isImage(
) || m_allowImagesToBreak) && (!m_lastObject->isListMarker() || toRenderListMark
er(m_lastObject)->isInside())) { |
894 m_width.commit(); | 894 m_width.commit(); |
895 m_lineBreak.moveToStartOf(m_nextObject); | 895 m_lineBreak.moveToStartOf(m_nextObject); |
896 } | 896 } |
897 } | 897 } |
898 } | 898 } |
899 | 899 |
900 inline IndentTextOrNot requiresIndent(bool isFirstLine, bool isAfterHardLineBrea
k, RenderStyle* style) | 900 inline IndentTextOrNot requiresIndent(bool isFirstLine, bool isAfterHardLineBrea
k, RenderStyle* style) |
901 { | 901 { |
902 if (isFirstLine) | 902 IndentTextOrNot shouldIndentText = DoNotIndentText; |
903 return IndentText; | 903 if (isFirstLine || (isAfterHardLineBreak && style->textIndentLine()) == Text
IndentEachLine) |
904 if (isAfterHardLineBreak && style->textIndentLine() == TextIndentEachLine) | 904 shouldIndentText = IndentText; |
905 return IndentText; | |
906 | 905 |
907 return DoNotIndentText; | 906 if (style->textIndentType() == TextIndentHanging) |
| 907 shouldIndentText = shouldIndentText == IndentText ? DoNotIndentText : In
dentText; |
| 908 |
| 909 return shouldIndentText; |
908 } | 910 } |
909 | 911 |
910 } | 912 } |
911 | 913 |
912 #endif // BreakingContextInlineHeaders_h | 914 #endif // BreakingContextInlineHeaders_h |
OLD | NEW |