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

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

Issue 444333005: Remove custom style building for -webkit-font-feature-settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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/css/CSSProperties.in ('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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 void setFontFamilyInitial(); 56 void setFontFamilyInitial();
57 void setFontFamilyInherit(const FontDescription&); 57 void setFontFamilyInherit(const FontDescription&);
58 void setFontFamilyValue(CSSValue*); 58 void setFontFamilyValue(CSSValue*);
59 59
60 void setFontSizeInitial(); 60 void setFontSizeInitial();
61 void setFontSizeInherit(const FontDescription&); 61 void setFontSizeInherit(const FontDescription&);
62 void setFontSizeValue(CSSValue*, RenderStyle* parentStyle, const RenderStyle * rootElementStyle); 62 void setFontSizeValue(CSSValue*, RenderStyle* parentStyle, const RenderStyle * rootElementStyle);
63 63
64 void setWeight(FontWeight); 64 void setWeight(FontWeight);
65 void setStretch(FontStretch); 65 void setStretch(FontStretch);
66 66 void setFeatureSettings(PassRefPtr<FontFeatureSettings>);
67 void setFeatureSettingsNormal();
68 void setFeatureSettingsValue(CSSValue*);
69
70 void setScript(const String& locale); 67 void setScript(const String& locale);
71 void setStyle(FontStyle); 68 void setStyle(FontStyle);
72 void setVariant(FontVariant); 69 void setVariant(FontVariant);
73 void setVariantLigatures(const FontDescription::VariantLigatures&); 70 void setVariantLigatures(const FontDescription::VariantLigatures&);
74 void setTextRendering(TextRenderingMode); 71 void setTextRendering(TextRenderingMode);
75 void setKerning(FontDescription::Kerning); 72 void setKerning(FontDescription::Kerning);
76 void setFontSmoothing(FontSmoothingMode); 73 void setFontSmoothing(FontSmoothingMode);
77 74
78 // FIXME: These need to just vend a Font object eventually. 75 // FIXME: These need to just vend a Font object eventually.
79 void createFont(PassRefPtrWillBeRawPtr<FontSelector>, const RenderStyle* par entStyle, RenderStyle*); 76 void createFont(PassRefPtrWillBeRawPtr<FontSelector>, const RenderStyle* par entStyle, RenderStyle*);
80 // FIXME: This is nearly static, should either made fully static or decompos ed into 77 // FIXME: This is nearly static, should either made fully static or decompos ed into
81 // FontBuilder calls at the callsite. 78 // FontBuilder calls at the callsite.
82 void createFontForDocument(PassRefPtrWillBeRawPtr<FontSelector>, RenderStyle *); 79 void createFontForDocument(PassRefPtrWillBeRawPtr<FontSelector>, RenderStyle *);
83 80
84 bool fontSizeHasViewportUnits() { return m_fontSizehasViewportUnits; } 81 bool fontSizeHasViewportUnits() { return m_fontSizehasViewportUnits; }
85 82
86 // FIXME: These should not be necessary eventually. 83 // FIXME: These should not be necessary eventually.
87 void setFontDirty(bool fontDirty) { m_fontDirty = fontDirty; } 84 void setFontDirty(bool fontDirty) { m_fontDirty = fontDirty; }
88 // FIXME: This is only used by an ASSERT in StyleResolver. Remove? 85 // FIXME: This is only used by an ASSERT in StyleResolver. Remove?
89 bool fontDirty() const { return m_fontDirty; } 86 bool fontDirty() const { return m_fontDirty; }
90 87
88 static FontFeatureSettings* initialFeatureSettings() { return nullptr; }
91 static FontDescription::GenericFamilyType initialGenericFamily() { return Fo ntDescription::NoFamily; } 89 static FontDescription::GenericFamilyType initialGenericFamily() { return Fo ntDescription::NoFamily; }
92 static TextRenderingMode initialTextRendering() { return AutoTextRendering; } 90 static TextRenderingMode initialTextRendering() { return AutoTextRendering; }
93 static FontVariant initialVariant() { return FontVariantNormal; } 91 static FontVariant initialVariant() { return FontVariantNormal; }
94 static FontDescription::VariantLigatures initialVariantLigatures() { return FontDescription::VariantLigatures(); } 92 static FontDescription::VariantLigatures initialVariantLigatures() { return FontDescription::VariantLigatures(); }
95 static FontStyle initialStyle() { return FontStyleNormal; } 93 static FontStyle initialStyle() { return FontStyleNormal; }
96 static FontDescription::Kerning initialKerning() { return FontDescription::A utoKerning; } 94 static FontDescription::Kerning initialKerning() { return FontDescription::A utoKerning; }
97 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; } 95 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; }
98 static FontStretch initialStretch() { return FontStretchNormal; } 96 static FontStretch initialStretch() { return FontStretchNormal; }
99 static FontWeight initialWeight() { return FontWeightNormal; } 97 static FontWeight initialWeight() { return FontWeightNormal; }
100 98
(...skipping 25 matching lines...) Expand all
126 // is changed, FontBuilder tracks the need to update 124 // is changed, FontBuilder tracks the need to update
127 // style->font() with this bool. 125 // style->font() with this bool.
128 bool m_fontDirty; 126 bool m_fontDirty;
129 127
130 friend class FontBuilderTest; 128 friend class FontBuilderTest;
131 }; 129 };
132 130
133 } 131 }
134 132
135 #endif 133 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698