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

Side by Side Diff: Source/core/rendering/RenderText.h

Issue 17072005: Floated elements inside a white-space:nowrap container should still wrap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add missing expectations lines Created 7 years, 6 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 | Annotate | Revision Log
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, 2008, 2009 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 float widthFromCache(const Font&, int start, int len, float xPos, HashSet<co nst SimpleFontData*>* fallbackFonts, GlyphOverflow*) const; 174 float widthFromCache(const Font&, int start, int len, float xPos, HashSet<co nst SimpleFontData*>* fallbackFonts, GlyphOverflow*) const;
175 bool isAllASCII() const { return m_isAllASCII; } 175 bool isAllASCII() const { return m_isAllASCII; }
176 void updateNeedsTranscoding(); 176 void updateNeedsTranscoding();
177 177
178 void secureText(UChar mask); 178 void secureText(UChar mask);
179 179
180 // We put the bitfield first to minimize padding on 64-bit. 180 // We put the bitfield first to minimize padding on 64-bit.
181 bool m_hasBreakableChar : 1; // Whether or not we can be broken into multipl e lines. 181 bool m_hasBreakableChar : 1; // Whether or not we can be broken into multipl e lines.
182 bool m_hasBreak : 1; // Whether or not we have a hard break (e.g., <pre> wit h '\n'). 182 bool m_hasBreak : 1; // Whether or not we have a hard break (e.g., <pre> wit h '\n').
183 bool m_hasTab : 1; // Whether or not we have a variable width tab character (e.g., <pre> with '\t'). 183 bool m_hasTab : 1; // Whether or not we have a variable width tab character (e.g., <pre> with '\t').
184 // FIXME: Rename m_hasBeginWS to m_hasBreakableStart and m_hasEndWS to m_has BreakableEnd.
184 bool m_hasBeginWS : 1; // Whether or not we begin with WS (only true if we a ren't pre) 185 bool m_hasBeginWS : 1; // Whether or not we begin with WS (only true if we a ren't pre)
185 bool m_hasEndWS : 1; // Whether or not we end with WS (only true if we aren' t pre) 186 bool m_hasEndWS : 1; // Whether or not we end with WS (only true if we aren' t pre)
187 bool m_hasEndWhiteSpace : 1;
186 bool m_linesDirty : 1; // This bit indicates that the text run has already d irtied specific 188 bool m_linesDirty : 1; // This bit indicates that the text run has already d irtied specific
187 // line boxes, and this hint will enable layoutInline Children to avoid 189 // line boxes, and this hint will enable layoutInline Children to avoid
188 // just dirtying everything when character data is mo dified (e.g., appended/inserted 190 // just dirtying everything when character data is mo dified (e.g., appended/inserted
189 // or removed). 191 // or removed).
190 bool m_containsReversedText : 1; 192 bool m_containsReversedText : 1;
191 bool m_isAllASCII : 1; 193 bool m_isAllASCII : 1;
192 bool m_canUseSimpleFontCodePath : 1; 194 bool m_canUseSimpleFontCodePath : 1;
193 mutable bool m_knownToHaveNoOverflowAndNoFallbackFonts : 1; 195 mutable bool m_knownToHaveNoOverflowAndNoFallbackFonts : 1;
194 bool m_needsTranscoding : 1; 196 bool m_needsTranscoding : 1;
195 197
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 inline void RenderText::checkConsistency() const 239 inline void RenderText::checkConsistency() const
238 { 240 {
239 } 241 }
240 #endif 242 #endif
241 243
242 void applyTextTransform(const RenderStyle*, String&, UChar); 244 void applyTextTransform(const RenderStyle*, String&, UChar);
243 245
244 } // namespace WebCore 246 } // namespace WebCore
245 247
246 #endif // RenderText_h 248 #endif // RenderText_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698