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/FontFace.h

Issue 181783005: Have Element::ensureMutableInlineStyle() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase 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/ElementRuleCollector.cpp ('k') | Source/core/css/FontFace.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 LoadStatus loadStatus() const { return m_status; } 83 LoadStatus loadStatus() const { return m_status; }
84 void setLoadStatus(LoadStatus); 84 void setLoadStatus(LoadStatus);
85 unsigned traitsMask() const; 85 unsigned traitsMask() const;
86 CSSFontFace* cssFontFace() { return m_cssFontFace.get(); } 86 CSSFontFace* cssFontFace() { return m_cssFontFace.get(); }
87 87
88 private: 88 private:
89 FontFace(PassRefPtrWillBeRawPtr<CSSValue> source); 89 FontFace(PassRefPtrWillBeRawPtr<CSSValue> source);
90 90
91 void initCSSFontFace(Document*); 91 void initCSSFontFace(Document*);
92 void setPropertyFromString(const Document*, const String&, CSSPropertyID, Ex ceptionState&); 92 void setPropertyFromString(const Document*, const String&, CSSPropertyID, Ex ceptionState&);
93 bool setPropertyFromStyle(const StylePropertySet*, CSSPropertyID); 93 bool setPropertyFromStyle(const StylePropertySet&, CSSPropertyID);
94 bool setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue>, CSSPropertyID); 94 bool setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue>, CSSPropertyID);
95 bool setFamilyValue(CSSValueList*); 95 bool setFamilyValue(CSSValueList*);
96 void resolveReadyPromises(); 96 void resolveReadyPromises();
97 97
98 AtomicString m_family; 98 AtomicString m_family;
99 RefPtr<CSSValue> m_src; 99 RefPtr<CSSValue> m_src;
100 RefPtr<CSSValue> m_style; 100 RefPtr<CSSValue> m_style;
101 RefPtr<CSSValue> m_weight; 101 RefPtr<CSSValue> m_weight;
102 RefPtr<CSSValue> m_stretch; 102 RefPtr<CSSValue> m_stretch;
103 RefPtr<CSSValue> m_unicodeRange; 103 RefPtr<CSSValue> m_unicodeRange;
104 RefPtr<CSSValue> m_variant; 104 RefPtr<CSSValue> m_variant;
105 RefPtr<CSSValue> m_featureSettings; 105 RefPtr<CSSValue> m_featureSettings;
106 LoadStatus m_status; 106 LoadStatus m_status;
107 107
108 Vector<OwnPtr<FontFaceReadyPromiseResolver> > m_readyResolvers; 108 Vector<OwnPtr<FontFaceReadyPromiseResolver> > m_readyResolvers;
109 OwnPtr<CSSFontFace> m_cssFontFace; 109 OwnPtr<CSSFontFace> m_cssFontFace;
110 }; 110 };
111 111
112 typedef Vector<RefPtr<FontFace> > FontFaceArray; 112 typedef Vector<RefPtr<FontFace> > FontFaceArray;
113 113
114 } // namespace WebCore 114 } // namespace WebCore
115 115
116 #endif // FontFace_h 116 #endif // FontFace_h
OLDNEW
« no previous file with comments | « Source/core/css/ElementRuleCollector.cpp ('k') | Source/core/css/FontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698