commit bfe3590b1806e3ff18f46ee3af5d4b83078f305a
author Torne (Richard Coles) <torne@google.com> Tue Oct 22 16:41:51 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Oct 22 16:41:51 2013 +0100
tree 685b45e3de5ce60bdf1e8286ccafada058cf077f
parent 9402e5a409a9456b6d38bc45e6a6983af4bfcd42

Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: Iab152fc67d869deb6e9505babd8d71cab63335dd

Source/core/css/CSSFontFeatureValue.h

diff --git a/Source/core/css/CSSFontFeatureValue.h b/Source/core/css/CSSFontFeatureValue.h
index d566a5b..011cd1e 100644
--- a/Source/core/css/CSSFontFeatureValue.h
+++ b/Source/core/css/CSSFontFeatureValue.h
@@ -40,7 +40,7 @@
 
     const String& tag() const { return m_tag; }
     int value() const { return m_value; }
-    String customCssText() const;
+    String customCSSText() const;
 
     bool equals(const CSSFontFeatureValue&) const;
 
@@ -51,7 +51,7 @@
     const int m_value;
 };
 
-DEFINE_CSS_VALUE_TYPE_CASTS(FontFeatureValue);
+DEFINE_CSS_VALUE_TYPE_CASTS(CSSFontFeatureValue, isFontFeatureValue());
 
 } // namespace