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

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

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-2009, 2013 Apple Inc. All rights reserved. 4 * Copyright (C) 2004-2009, 2013 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 // TODO(eae): Rename and change to only handle the word measurements use 173 // TODO(eae): Rename and change to only handle the word measurements use
174 // case once the simple code path has been removed. crbug.com/404597 174 // case once the simple code path has been removed. crbug.com/404597
175 bool canUseSimpleFontCodePath() const { return m_canUseSimpleFontCodePath; } 175 bool canUseSimpleFontCodePath() const { return m_canUseSimpleFontCodePath; }
176 176
177 void removeAndDestroyTextBoxes(); 177 void removeAndDestroyTextBoxes();
178 178
179 PassRefPtr<AbstractInlineTextBox> firstAbstractInlineTextBox(); 179 PassRefPtr<AbstractInlineTextBox> firstAbstractInlineTextBox();
180 180
181 float hyphenWidth(const Font&, TextDirection); 181 float hyphenWidth(const Font&, TextDirection);
182 182
183 bool hasLineBreakForTextWrap() { return m_hasLineBreakForTextWrap; }
184 void setLineBreakForTextWrap(bool hasLineBreakForTextWrap) { m_hasLineBreakF orTextWrap = hasLineBreakForTextWrap; }
185
183 protected: 186 protected:
184 void willBeDestroyed() override; 187 void willBeDestroyed() override;
185 188
186 void styleWillChange(StyleDifference, const ComputedStyle&) final { } 189 void styleWillChange(StyleDifference, const ComputedStyle&) final { }
187 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override ; 190 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override ;
188 191
189 virtual void setTextInternal(PassRefPtr<StringImpl>); 192 virtual void setTextInternal(PassRefPtr<StringImpl>);
190 virtual UChar previousCharacter() const; 193 virtual UChar previousCharacter() const;
191 194
192 void addLayerHitTestRects(LayerHitTestRects&, const PaintLayer* currentLayer , const LayoutPoint& layerOffset, const LayoutRect& containerRect) const overrid e; 195 void addLayerHitTestRects(LayerHitTestRects&, const PaintLayer* currentLayer , const LayoutPoint& layerOffset, const LayoutRect& containerRect) const overrid e;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 bool m_hasBreakableEnd : 1; 234 bool m_hasBreakableEnd : 1;
232 bool m_hasEndWhiteSpace : 1; 235 bool m_hasEndWhiteSpace : 1;
233 // This bit indicates that the text run has already dirtied specific 236 // This bit indicates that the text run has already dirtied specific
234 // line boxes, and this hint will enable layoutInlineChildren to avoid 237 // line boxes, and this hint will enable layoutInlineChildren to avoid
235 // just dirtying everything when character data is modified (e.g., appended/ inserted 238 // just dirtying everything when character data is modified (e.g., appended/ inserted
236 // or removed). 239 // or removed).
237 bool m_linesDirty : 1; 240 bool m_linesDirty : 1;
238 bool m_containsReversedText : 1; 241 bool m_containsReversedText : 1;
239 bool m_canUseSimpleFontCodePath : 1; 242 bool m_canUseSimpleFontCodePath : 1;
240 mutable bool m_knownToHaveNoOverflowAndNoFallbackFonts : 1; 243 mutable bool m_knownToHaveNoOverflowAndNoFallbackFonts : 1;
244 bool m_hasLineBreakForTextWrap : 1;
241 245
242 float m_minWidth; 246 float m_minWidth;
243 float m_maxWidth; 247 float m_maxWidth;
244 float m_firstLineMinWidth; 248 float m_firstLineMinWidth;
245 float m_lastLineLineMinWidth; 249 float m_lastLineLineMinWidth;
246 250
247 String m_text; 251 String m_text;
248 252
249 // The line boxes associated with this object. 253 // The line boxes associated with this object.
250 // Read the LINE BOXES OWNERSHIP section in the class header comment. 254 // Read the LINE BOXES OWNERSHIP section in the class header comment.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 inline LayoutText* Text::layoutObject() const 296 inline LayoutText* Text::layoutObject() const
293 { 297 {
294 return toLayoutText(CharacterData::layoutObject()); 298 return toLayoutText(CharacterData::layoutObject());
295 } 299 }
296 300
297 void applyTextTransform(const ComputedStyle*, String&, UChar); 301 void applyTextTransform(const ComputedStyle*, String&, UChar);
298 302
299 } // namespace blink 303 } // namespace blink
300 304
301 #endif // LayoutText_h 305 #endif // LayoutText_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698