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

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

Issue 100463004: Make calls to AtomicString(const String&) explicit in css/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Make MediaQuery::mediaType() return an AtomicString Created 7 years 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
Index: Source/core/css/FontFace.h
diff --git a/Source/core/css/FontFace.h b/Source/core/css/FontFace.h
index 5ff760692d9db6f8fbeecef26e3c8bdadeeda935..900d3a7c962707da1bf8e3f5c9392f26d990fb4f 100644
--- a/Source/core/css/FontFace.h
+++ b/Source/core/css/FontFace.h
@@ -53,12 +53,12 @@ class FontFace : public RefCounted<FontFace> {
public:
enum LoadStatus { Unloaded, Loading, Loaded, Error };
- static PassRefPtr<FontFace> create(const String& family, const String& source, const Dictionary&, ExceptionState&);
+ static PassRefPtr<FontFace> create(const AtomicString& family, const String& source, const Dictionary&, ExceptionState&);
static PassRefPtr<FontFace> create(const StyleRuleFontFace*);
~FontFace();
- String family() const { return m_family; }
+ const AtomicString& family() const { return m_family; }
String style() const;
String weight() const;
String stretch() const;
@@ -67,7 +67,7 @@ public:
String featureSettings() const;
// FIXME: Changing these attributes should affect font matching.
- void setFamily(const String& s, ExceptionState&) { m_family = s; }
+ void setFamily(const AtomicString& s, ExceptionState&) { m_family = s; }
void setStyle(const String&, ExceptionState&);
void setWeight(const String&, ExceptionState&);
void setStretch(const String&, ExceptionState&);
@@ -95,7 +95,7 @@ private:
bool setFamilyValue(CSSValueList*);
void resolveReadyPromises();
- String m_family;
+ AtomicString m_family;
RefPtr<CSSValue> m_src;
RefPtr<CSSValue> m_style;
RefPtr<CSSValue> m_weight;

Powered by Google App Engine
This is Rietveld 408576698