Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: Idca0efe87ed6b721349fbeab55bfdc919cc4941d
diff --git a/Source/core/css/CSSFontFeatureValue.h b/Source/core/css/CSSFontFeatureValue.h
index 011cd1e..8a0367f 100644
--- a/Source/core/css/CSSFontFeatureValue.h
+++ b/Source/core/css/CSSFontFeatureValue.h
@@ -33,21 +33,21 @@
class CSSFontFeatureValue : public CSSValue {
public:
- static PassRefPtr<CSSFontFeatureValue> create(const String& tag, int value)
+ static PassRefPtr<CSSFontFeatureValue> create(const AtomicString& tag, int value)
{
return adoptRef(new CSSFontFeatureValue(tag, value));
}
- const String& tag() const { return m_tag; }
+ const AtomicString& tag() const { return m_tag; }
int value() const { return m_value; }
String customCSSText() const;
bool equals(const CSSFontFeatureValue&) const;
private:
- CSSFontFeatureValue(const String&, int);
+ CSSFontFeatureValue(const AtomicString& tag, int value);
- String m_tag;
+ AtomicString m_tag;
const int m_value;
};