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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 void setFeatureSettings(PassRefPtr<FontFeatureSettings>); 62 void setFeatureSettings(PassRefPtr<FontFeatureSettings>);
63 void setLocale(const AtomicString&); 63 void setLocale(const AtomicString&);
64 void setStyle(FontStyle); 64 void setStyle(FontStyle);
65 void setVariant(FontVariant); 65 void setVariant(FontVariant);
66 void setVariantLigatures(const FontDescription::VariantLigatures&); 66 void setVariantLigatures(const FontDescription::VariantLigatures&);
67 void setTextRendering(TextRenderingMode); 67 void setTextRendering(TextRenderingMode);
68 void setKerning(FontDescription::Kerning); 68 void setKerning(FontDescription::Kerning);
69 void setFontSmoothing(FontSmoothingMode); 69 void setFontSmoothing(FontSmoothingMode);
70 70
71 // FIXME: These need to just vend a Font object eventually. 71 // FIXME: These need to just vend a Font object eventually.
72 void createFont(PassRefPtrWillBeRawPtr<FontSelector>, ComputedStyle&); 72 void createFont(RawPtr<FontSelector>, ComputedStyle&);
73 73
74 void createFontForDocument(PassRefPtrWillBeRawPtr<FontSelector>, ComputedSty le&); 74 void createFontForDocument(RawPtr<FontSelector>, ComputedStyle&);
75 75
76 bool fontDirty() const { return m_flags; } 76 bool fontDirty() const { return m_flags; }
77 77
78 static FontDescription::FamilyDescription initialFamilyDescription() { retur n FontDescription::FamilyDescription(initialGenericFamily()); } 78 static FontDescription::FamilyDescription initialFamilyDescription() { retur n FontDescription::FamilyDescription(initialGenericFamily()); }
79 static FontFeatureSettings* initialFeatureSettings() { return nullptr; } 79 static FontFeatureSettings* initialFeatureSettings() { return nullptr; }
80 static FontDescription::GenericFamilyType initialGenericFamily() { return Fo ntDescription::StandardFamily; } 80 static FontDescription::GenericFamilyType initialGenericFamily() { return Fo ntDescription::StandardFamily; }
81 static FontDescription::Size initialSize() { return FontDescription::Size(Fo ntSize::initialKeywordSize(), 0.0f, false); } 81 static FontDescription::Size initialSize() { return FontDescription::Size(Fo ntSize::initialKeywordSize(), 0.0f, false); }
82 static float initialSizeAdjust() { return FontSizeAdjustNone; } 82 static float initialSizeAdjust() { return FontSizeAdjustNone; }
83 static TextRenderingMode initialTextRendering() { return AutoTextRendering; } 83 static TextRenderingMode initialTextRendering() { return AutoTextRendering; }
84 static FontVariant initialVariant() { return FontVariantNormal; } 84 static FontVariant initialVariant() { return FontVariantNormal; }
(...skipping 11 matching lines...) Expand all
96 void setSize(FontDescription&, const FontDescription::Size&); 96 void setSize(FontDescription&, const FontDescription::Size&);
97 void updateOrientation(FontDescription&, const ComputedStyle&); 97 void updateOrientation(FontDescription&, const ComputedStyle&);
98 // This function fixes up the default font size if it detects that the curre nt generic font family has changed. -dwh 98 // This function fixes up the default font size if it detects that the curre nt generic font family has changed. -dwh
99 void checkForGenericFamilyChange(const FontDescription&, FontDescription&); 99 void checkForGenericFamilyChange(const FontDescription&, FontDescription&);
100 void updateSpecifiedSize(FontDescription&, const ComputedStyle&); 100 void updateSpecifiedSize(FontDescription&, const ComputedStyle&);
101 void updateComputedSize(FontDescription&, const ComputedStyle&); 101 void updateComputedSize(FontDescription&, const ComputedStyle&);
102 void updateAdjustedSize(FontDescription&, const ComputedStyle&, FontSelector *); 102 void updateAdjustedSize(FontDescription&, const ComputedStyle&, FontSelector *);
103 103
104 float getComputedSizeFromSpecifiedSize(FontDescription&, float effectiveZoom , float specifiedSize); 104 float getComputedSizeFromSpecifiedSize(FontDescription&, float effectiveZoom , float specifiedSize);
105 105
106 RawPtrWillBeMember<const Document> m_document; 106 Member<const Document> m_document;
107 FontDescription m_fontDescription; 107 FontDescription m_fontDescription;
108 108
109 enum class PropertySetFlag { 109 enum class PropertySetFlag {
110 Weight, 110 Weight,
111 Size, 111 Size,
112 Stretch, 112 Stretch,
113 Family, 113 Family,
114 FeatureSettings, 114 FeatureSettings,
115 Locale, 115 Locale,
116 Style, 116 Style,
(...skipping 11 matching lines...) Expand all
128 128
129 void set(PropertySetFlag flag) { m_flags |= (1 << unsigned(flag)); } 129 void set(PropertySetFlag flag) { m_flags |= (1 << unsigned(flag)); }
130 bool isSet(PropertySetFlag flag) const { return m_flags & (1 << unsigned(fla g)); } 130 bool isSet(PropertySetFlag flag) const { return m_flags & (1 << unsigned(fla g)); }
131 131
132 unsigned m_flags; 132 unsigned m_flags;
133 }; 133 };
134 134
135 } // namespace blink 135 } // namespace blink
136 136
137 #endif 137 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698