Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutText.cpp

Issue 2280513004: Restore a collapsed trailing space of text used for line break (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add CJK and word-break: break-all cases Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 *string = result.toString(); 138 *string = result.toString();
139 } 139 }
140 140
141 LayoutText::LayoutText(Node* node, PassRefPtr<StringImpl> str) 141 LayoutText::LayoutText(Node* node, PassRefPtr<StringImpl> str)
142 : LayoutObject(!node || node->isDocumentNode() ? 0 : node) 142 : LayoutObject(!node || node->isDocumentNode() ? 0 : node)
143 , m_hasTab(false) 143 , m_hasTab(false)
144 , m_linesDirty(false) 144 , m_linesDirty(false)
145 , m_containsReversedText(false) 145 , m_containsReversedText(false)
146 , m_knownToHaveNoOverflowAndNoFallbackFonts(false) 146 , m_knownToHaveNoOverflowAndNoFallbackFonts(false)
147 , m_hasLineBreakForTextWrap(false)
147 , m_minWidth(-1) 148 , m_minWidth(-1)
148 , m_maxWidth(-1) 149 , m_maxWidth(-1)
149 , m_firstLineMinWidth(0) 150 , m_firstLineMinWidth(0)
150 , m_lastLineLineMinWidth(0) 151 , m_lastLineLineMinWidth(0)
151 , m_text(str) 152 , m_text(str)
152 , m_firstTextBox(nullptr) 153 , m_firstTextBox(nullptr)
153 , m_lastTextBox(nullptr) 154 , m_lastTextBox(nullptr)
154 { 155 {
155 ASSERT(m_text); 156 ASSERT(m_text);
156 // FIXME: Some clients of LayoutText (and subclasses) pass Document as node to create anonymous layoutObject. 157 // FIXME: Some clients of LayoutText (and subclasses) pass Document as node to create anonymous layoutObject.
(...skipping 1600 matching lines...) Expand 10 before | Expand all | Expand 10 after
1757 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { 1758 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
1758 paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason); 1759 paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason);
1759 if (box->truncation() != cNoTruncation) { 1760 if (box->truncation() != cNoTruncation) {
1760 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox()) 1761 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox())
1761 paintInvalidator.invalidateDisplayItemClient(*ellipsisBox, inval idationReason); 1762 paintInvalidator.invalidateDisplayItemClient(*ellipsisBox, inval idationReason);
1762 } 1763 }
1763 } 1764 }
1764 } 1765 }
1765 1766
1766 } // namespace blink 1767 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698