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

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

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 years, 5 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
« no previous file with comments | « Source/core/rendering/RenderTable.cpp ('k') | Source/core/rendering/RenderText.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 const UChar* characters16() const { return m_text.impl()->characters16(); } 78 const UChar* characters16() const { return m_text.impl()->characters16(); }
79 bool hasEmptyText() const { return m_text.isEmpty(); } 79 bool hasEmptyText() const { return m_text.isEmpty(); }
80 String substring(unsigned position, unsigned length) const { return m_text.s ubstring(position, length); } 80 String substring(unsigned position, unsigned length) const { return m_text.s ubstring(position, length); }
81 UChar characterAt(unsigned) const; 81 UChar characterAt(unsigned) const;
82 UChar uncheckedCharacterAt(unsigned) const; 82 UChar uncheckedCharacterAt(unsigned) const;
83 UChar operator[](unsigned i) const { return uncheckedCharacterAt(i); } 83 UChar operator[](unsigned i) const { return uncheckedCharacterAt(i); }
84 unsigned textLength() const { return m_text.length(); } // non virtual imple mentation of length() 84 unsigned textLength() const { return m_text.length(); } // non virtual imple mentation of length()
85 void positionLineBox(InlineBox*); 85 void positionLineBox(InlineBox*);
86 86
87 virtual float width(unsigned from, unsigned len, const Font&, float xPos, Te xtDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const; 87 virtual float width(unsigned from, unsigned len, const Font&, float xPos, Te xtDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
88 virtual float width(unsigned from, unsigned len, float xPos, TextDirection, bool firstLine = false, HashSet<const SimpleFontData*>* fallbackFonts = 0, Glyph Overflow* = 0) const; 88 virtual float width(unsigned from, unsigned len, float xPos, TextDirection, OwnOrFirstLineStyle = OwnStyle, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
89 89
90 float minLogicalWidth() const; 90 float minLogicalWidth() const;
91 float maxLogicalWidth() const; 91 float maxLogicalWidth() const;
92 92
93 void trimmedPrefWidths(float leadWidth, 93 void trimmedPrefWidths(float leadWidth,
94 float& firstLineMinWidth, bool& hasBreakableStart, 94 float& firstLineMinWidth, bool& hasBreakableStart,
95 float& lastLineMinWidth, bool& hasBreakableEnd, 95 float& lastLineMinWidth, bool& hasBreakableEnd,
96 bool& hasBreakableChar, bool& hasBreak, 96 bool& hasBreakableChar, bool& hasBreak,
97 float& firstLineMaxWidth, float& lastLineMaxWidth, 97 float& firstLineMaxWidth, float& lastLineMaxWidth,
98 float& minWidth, float& maxWidth, bool& stripFrontSpaces, 98 float& minWidth, float& maxWidth, bool& stripFrontSpaces,
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 inline void RenderText::checkConsistency() const 229 inline void RenderText::checkConsistency() const
230 { 230 {
231 } 231 }
232 #endif 232 #endif
233 233
234 void applyTextTransform(const RenderStyle*, String&, UChar); 234 void applyTextTransform(const RenderStyle*, String&, UChar);
235 235
236 } // namespace WebCore 236 } // namespace WebCore
237 237
238 #endif // RenderText_h 238 #endif // RenderText_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTable.cpp ('k') | Source/core/rendering/RenderText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698