| 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 * Copyright (C) 2013 Adobe Systems Incorporated. | 6 * Copyright (C) 2013 Adobe Systems Incorporated. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 1422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1433 | 1433 |
| 1434 bool canPlaceOnLine = | 1434 bool canPlaceOnLine = |
| 1435 m_width.fitsOnLine() || !m_autoWrapWasEverTrueOnLine; | 1435 m_width.fitsOnLine() || !m_autoWrapWasEverTrueOnLine; |
| 1436 if (canPlaceOnLine && checkForBreak) { | 1436 if (canPlaceOnLine && checkForBreak) { |
| 1437 m_width.commit(); | 1437 m_width.commit(); |
| 1438 m_lineBreak.moveToStartOf(m_nextObject); | 1438 m_lineBreak.moveToStartOf(m_nextObject); |
| 1439 } | 1439 } |
| 1440 } | 1440 } |
| 1441 } | 1441 } |
| 1442 | 1442 |
| 1443 ASSERT_WITH_SECURITY_IMPLICATION(m_currentStyle->refCount() > 0); | 1443 SECURITY_DCHECK(m_currentStyle->refCount() > 0); |
| 1444 if (checkForBreak && !m_width.fitsOnLine()) { | 1444 if (checkForBreak && !m_width.fitsOnLine()) { |
| 1445 // if we have floats, try to get below them. | 1445 // if we have floats, try to get below them. |
| 1446 if (m_currentCharacterIsSpace && !m_ignoringSpaces && | 1446 if (m_currentCharacterIsSpace && !m_ignoringSpaces && |
| 1447 m_currentStyle->collapseWhiteSpace()) | 1447 m_currentStyle->collapseWhiteSpace()) |
| 1448 m_trailingObjects.clear(); | 1448 m_trailingObjects.clear(); |
| 1449 | 1449 |
| 1450 if (m_width.committedWidth()) { | 1450 if (m_width.committedWidth()) { |
| 1451 m_atEnd = true; | 1451 m_atEnd = true; |
| 1452 return; | 1452 return; |
| 1453 } | 1453 } |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1491 | 1491 |
| 1492 if (style.getTextIndentType() == TextIndentHanging) | 1492 if (style.getTextIndentType() == TextIndentHanging) |
| 1493 indentText = indentText == IndentText ? DoNotIndentText : IndentText; | 1493 indentText = indentText == IndentText ? DoNotIndentText : IndentText; |
| 1494 | 1494 |
| 1495 return indentText; | 1495 return indentText; |
| 1496 } | 1496 } |
| 1497 | 1497 |
| 1498 } // namespace blink | 1498 } // namespace blink |
| 1499 | 1499 |
| 1500 #endif // BreakingContextInlineHeaders_h | 1500 #endif // BreakingContextInlineHeaders_h |
| OLD | NEW |