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

Unified Diff: Source/core/css/FontFace.h

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/ComputedStyleCSSValueMapping.cpp ('k') | Source/core/css/FontFace.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/FontFace.h
diff --git a/Source/core/css/FontFace.h b/Source/core/css/FontFace.h
index 23fd4b20372793b535db615a0d9200717b73c63e..38084ccc5eac2fc6e39b5a6e2f6df3f2d3888d93 100644
--- a/Source/core/css/FontFace.h
+++ b/Source/core/css/FontFace.h
@@ -120,11 +120,11 @@ private:
explicit FontFace(ExecutionContext*);
FontFace(ExecutionContext*, const AtomicString& family, const FontFaceDescriptors&);
- void initCSSFontFace(Document*, PassRefPtrWillBeRawPtr<CSSValue> src);
+ void initCSSFontFace(Document*, CSSValue src);
void initCSSFontFace(const unsigned char* data, unsigned size);
void setPropertyFromString(const Document*, const String&, CSSPropertyID, ExceptionState* = 0);
bool setPropertyFromStyle(const StylePropertySet&, CSSPropertyID);
- bool setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue>, CSSPropertyID);
+ bool setPropertyValue(NullableCSSValue, CSSPropertyID);
bool setFamilyValue(CSSValueList*);
void loadInternal(ExecutionContext*);
ScriptPromise fontStatusPromise(ScriptState*);
@@ -133,13 +133,13 @@ private:
AtomicString m_family;
String m_otsParseMessage;
- RefPtrWillBeMember<CSSValue> m_src;
- RefPtrWillBeMember<CSSValue> m_style;
- RefPtrWillBeMember<CSSValue> m_weight;
- RefPtrWillBeMember<CSSValue> m_stretch;
- RefPtrWillBeMember<CSSValue> m_unicodeRange;
- RefPtrWillBeMember<CSSValue> m_variant;
- RefPtrWillBeMember<CSSValue> m_featureSettings;
+ NullableCSSValue m_src;
+ NullableCSSValue m_style;
+ NullableCSSValue m_weight;
+ NullableCSSValue m_stretch;
+ NullableCSSValue m_unicodeRange;
+ NullableCSSValue m_variant;
+ NullableCSSValue m_featureSettings;
LoadStatus m_status;
PersistentWillBeMember<DOMException> m_error;
« no previous file with comments | « Source/core/css/ComputedStyleCSSValueMapping.cpp ('k') | Source/core/css/FontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698