Chromium Code Reviews| 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 988 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 999 if (hyphenate(layoutText, style, font, *hyphenation, lastSpaceWordSp acing, wordMeasurement)) { | 999 if (hyphenate(layoutText, style, font, *hyphenation, lastSpaceWordSp acing, wordMeasurement)) { |
| 1000 hyphenated = true; | 1000 hyphenated = true; |
| 1001 m_atEnd = true; | 1001 m_atEnd = true; |
| 1002 } | 1002 } |
| 1003 m_width.addUncommittedWidth(wordMeasurement.width); | 1003 m_width.addUncommittedWidth(wordMeasurement.width); |
| 1004 } | 1004 } |
| 1005 if (!hyphenated && isBreakAtSoftHyphen() && !disableSoftHyphen) { | 1005 if (!hyphenated && isBreakAtSoftHyphen() && !disableSoftHyphen) { |
| 1006 hyphenated = true; | 1006 hyphenated = true; |
| 1007 m_atEnd = true; | 1007 m_atEnd = true; |
| 1008 } | 1008 } |
| 1009 if (!m_ignoringSpaces && canBreakMidWord) | |
|
kojii
2016/09/27 07:51:01
Probably this can be "else if"?
| |
| 1010 m_atEnd = true; | |
| 1009 } | 1011 } |
| 1010 return false; | 1012 return false; |
| 1011 } | 1013 } |
| 1012 | 1014 |
| 1013 inline void BreakingContext::prepareForNextCharacter(const LineLayoutText& layou tText, bool& prohibitBreakInside, bool previousCharacterIsSpace) | 1015 inline void BreakingContext::prepareForNextCharacter(const LineLayoutText& layou tText, bool& prohibitBreakInside, bool previousCharacterIsSpace) |
| 1014 { | 1016 { |
| 1015 if (layoutText.isSVGInlineText() && m_current.offset()) { | 1017 if (layoutText.isSVGInlineText() && m_current.offset()) { |
| 1016 // Force creation of new InlineBoxes for each absolute positioned charac ter (those that start new text chunks). | 1018 // Force creation of new InlineBoxes for each absolute positioned charac ter (those that start new text chunks). |
| 1017 if (LineLayoutSVGInlineText(layoutText).characterStartsNewTextChunk(m_cu rrent.offset())) | 1019 if (LineLayoutSVGInlineText(layoutText).characterStartsNewTextChunk(m_cu rrent.offset())) |
| 1018 m_lineMidpointState.ensureCharacterGetsLineBox(m_current); | 1020 m_lineMidpointState.ensureCharacterGetsLineBox(m_current); |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1202 | 1204 |
| 1203 if (style.getTextIndentType() == TextIndentHanging) | 1205 if (style.getTextIndentType() == TextIndentHanging) |
| 1204 indentText = indentText == IndentText ? DoNotIndentText : IndentText; | 1206 indentText = indentText == IndentText ? DoNotIndentText : IndentText; |
| 1205 | 1207 |
| 1206 return indentText; | 1208 return indentText; |
| 1207 } | 1209 } |
| 1208 | 1210 |
| 1209 } // namespace blink | 1211 } // namespace blink |
| 1210 | 1212 |
| 1211 #endif // BreakingContextInlineHeaders_h | 1213 #endif // BreakingContextInlineHeaders_h |
| OLD | NEW |