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

Side by Side Diff: Source/core/css/resolver/FontBuilder.h

Issue 205743004: Expand system font values during font property parsing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase and fix up unittest use of systemFont() Created 6 years, 9 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
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.cpp ('k') | Source/core/css/resolver/FontBuilder.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 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2013 Google Inc. All rights reserved. 4 * Copyright (C) 2013 Google 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 FontBuilder(); 42 FontBuilder();
43 43
44 // FIXME: The name is probably wrong, but matches StyleResolverState callsit e for consistency. 44 // FIXME: The name is probably wrong, but matches StyleResolverState callsit e for consistency.
45 void initForStyleResolve(const Document&, RenderStyle*, bool useSVGZoomRules ); 45 void initForStyleResolve(const Document&, RenderStyle*, bool useSVGZoomRules );
46 46
47 void setInitial(float effectiveZoom); 47 void setInitial(float effectiveZoom);
48 48
49 void didChangeFontParameters(bool); 49 void didChangeFontParameters(bool);
50 50
51 void inheritFrom(const FontDescription&); 51 void inheritFrom(const FontDescription&);
52 void fromSystemFont(CSSValueID, float effectiveZoom);
53 52
54 void setFontFamilyInitial(); 53 void setFontFamilyInitial();
55 void setFontFamilyInherit(const FontDescription&); 54 void setFontFamilyInherit(const FontDescription&);
56 void setFontFamilyValue(CSSValue*); 55 void setFontFamilyValue(CSSValue*);
57 56
58 void setFontSizeInitial(); 57 void setFontSizeInitial();
59 void setFontSizeInherit(const FontDescription&); 58 void setFontSizeInherit(const FontDescription&);
60 void setFontSizeValue(CSSValue*, RenderStyle* parentStyle, const RenderStyle * rootElementStyle); 59 void setFontSizeValue(CSSValue*, RenderStyle* parentStyle, const RenderStyle * rootElementStyle);
61 60
62 void setWeight(FontWeight); 61 void setWeight(FontWeight);
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // is changed, FontBuilder tracks the need to update 125 // is changed, FontBuilder tracks the need to update
127 // style->font() with this bool. 126 // style->font() with this bool.
128 bool m_fontDirty; 127 bool m_fontDirty;
129 128
130 friend class FontBuilderTest; 129 friend class FontBuilderTest;
131 }; 130 };
132 131
133 } 132 }
134 133
135 #endif 134 #endif
OLDNEW
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.cpp ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698