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

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

Issue 677103002: Expand system font values during property parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove isExpandedShorthandForAll. Created 6 years, 1 month 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/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 WTF_MAKE_NONCOPYABLE(FontBuilder); 42 WTF_MAKE_NONCOPYABLE(FontBuilder);
43 public: 43 public:
44 FontBuilder(const Document&); 44 FontBuilder(const Document&);
45 45
46 void setStyle(RenderStyle* style) { m_style = style; } 46 void setStyle(RenderStyle* style) { m_style = style; }
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 FontFamily standardFontFamily() const; 53 FontFamily standardFontFamily() const;
55 AtomicString standardFontFamilyName() const; 54 AtomicString standardFontFamilyName() const;
56 AtomicString genericFontFamilyName(FontDescription::GenericFamilyType) const ; 55 AtomicString genericFontFamilyName(FontDescription::GenericFamilyType) const ;
57 56
58 void setWeight(FontWeight); 57 void setWeight(FontWeight);
59 void setSize(const FontDescription::Size&); 58 void setSize(const FontDescription::Size&);
60 void setStretch(FontStretch); 59 void setStretch(FontStretch);
61 void setFamilyDescription(const FontDescription::FamilyDescription&); 60 void setFamilyDescription(const FontDescription::FamilyDescription&);
62 void setFeatureSettings(PassRefPtr<FontFeatureSettings>); 61 void setFeatureSettings(PassRefPtr<FontFeatureSettings>);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // is changed, FontBuilder tracks the need to update 118 // is changed, FontBuilder tracks the need to update
120 // style->font() with this bool. 119 // style->font() with this bool.
121 bool m_fontDirty; 120 bool m_fontDirty;
122 121
123 friend class FontBuilderTest; 122 friend class FontBuilderTest;
124 }; 123 };
125 124
126 } 125 }
127 126
128 #endif 127 #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