| OLD | NEW |
| 1 /* | 1 /* |
| 2 * (C) 1999 Lars Knoll (knoll@kde.org) | 2 * (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Dirk Mueller (mueller@kde.org) | 3 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. | 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. |
| 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) | 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) |
| 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 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 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1104 | 1104 |
| 1105 if (!styleToUse.autoWrap()) | 1105 if (!styleToUse.autoWrap()) |
| 1106 m_minWidth = m_maxWidth; | 1106 m_minWidth = m_maxWidth; |
| 1107 | 1107 |
| 1108 if (styleToUse.whiteSpace() == PRE) { | 1108 if (styleToUse.whiteSpace() == PRE) { |
| 1109 if (firstLine) | 1109 if (firstLine) |
| 1110 m_firstLineMinWidth = m_maxWidth; | 1110 m_firstLineMinWidth = m_maxWidth; |
| 1111 m_lastLineLineMinWidth = currMaxWidth; | 1111 m_lastLineLineMinWidth = currMaxWidth; |
| 1112 } | 1112 } |
| 1113 | 1113 |
| 1114 // TODO(wkorman): Look into potentially removing GlyphOverflow or at least t
he | |
| 1115 // computeBounds field as we no longer use it for line-box-contain implement
ation. | |
| 1116 GlyphOverflow glyphOverflow; | 1114 GlyphOverflow glyphOverflow; |
| 1117 glyphOverflow.setFromBounds(glyphBounds, f.fontMetrics().floatAscent(), f.fo
ntMetrics().floatDescent(), m_maxWidth); | 1115 glyphOverflow.setFromBounds(glyphBounds, f.fontMetrics().floatAscent(), f.fo
ntMetrics().floatDescent(), m_maxWidth); |
| 1118 // We shouldn't change our mind once we "know". | 1116 // We shouldn't change our mind once we "know". |
| 1119 ASSERT(!m_knownToHaveNoOverflowAndNoFallbackFonts || (fallbackFonts.isEmpty(
) && glyphOverflow.isZero())); | 1117 ASSERT(!m_knownToHaveNoOverflowAndNoFallbackFonts || (fallbackFonts.isEmpty(
) && glyphOverflow.isZero())); |
| 1120 m_knownToHaveNoOverflowAndNoFallbackFonts = fallbackFonts.isEmpty() && glyph
Overflow.isZero(); | 1118 m_knownToHaveNoOverflowAndNoFallbackFonts = fallbackFonts.isEmpty() && glyph
Overflow.isZero(); |
| 1121 | 1119 |
| 1122 clearPreferredLogicalWidthsDirty(); | 1120 clearPreferredLogicalWidthsDirty(); |
| 1123 } | 1121 } |
| 1124 | 1122 |
| 1125 bool LayoutText::isAllCollapsibleWhitespace() const | 1123 bool LayoutText::isAllCollapsibleWhitespace() const |
| (...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1881 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { | 1879 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { |
| 1882 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box); | 1880 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box); |
| 1883 if (box->truncation() != cNoTruncation) { | 1881 if (box->truncation() != cNoTruncation) { |
| 1884 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox()) | 1882 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox()) |
| 1885 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(
*ellipsisBox); | 1883 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(
*ellipsisBox); |
| 1886 } | 1884 } |
| 1887 } | 1885 } |
| 1888 } | 1886 } |
| 1889 | 1887 |
| 1890 } // namespace blink | 1888 } // namespace blink |
| OLD | NEW |