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

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

Powered by Google App Engine
This is Rietveld 408576698