webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 12 insertions, 15 deletions

diff --git a/Source/WebCore/css/CSSFontFeatureValue.h b/Source/WebCore/css/CSSFontFeatureValue.h
index 94b2c64ec..f444fe36d 100644
--- a/Source/WebCore/css/CSSFontFeatureValue.h
+++ b/Source/WebCore/css/CSSFontFeatureValue.h
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -23,36 +23,33 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CSSFontFeatureValue_h
-#define CSSFontFeatureValue_h
+#pragma once
 
 #include "CSSValue.h"
-#include <wtf/text/WTFString.h>
+#include "FontTaggedSettings.h"
 
 namespace WebCore {
 
-class CSSFontFeatureValue : public CSSValue {
+class CSSFontFeatureValue final : public CSSValue {
 public:
-    static PassRef<CSSFontFeatureValue> create(const String& tag, int value)
+    static Ref<CSSFontFeatureValue> create(FontTag&& tag, int value)
     {
-        return adoptRef(*new CSSFontFeatureValue(tag, value));
+        return adoptRef(*new CSSFontFeatureValue(WTFMove(tag), value));
     }
 
-    const String& tag() const { return m_tag; }
+    const FontTag& 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(FontTag&&, int);
 
-    String m_tag;
+    FontTag m_tag;
     const int m_value;
 };
 
-CSS_VALUE_TYPE_CASTS(CSSFontFeatureValue, isFontFeatureValue())
+} // namespace WebCore
 
-} // namespace
-
-#endif
+SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSFontFeatureValue, isFontFeatureValue())