webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 12 insertions, 13 deletions

diff --git a/Source/WebCore/css/CSSFontFaceRule.h b/Source/WebCore/css/CSSFontFaceRule.h
index 32c8da977..e331c15db 100644
--- a/Source/WebCore/css/CSSFontFaceRule.h
+++ b/Source/WebCore/css/CSSFontFaceRule.h
@@ -19,8 +19,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef CSSFontFaceRule_h
-#define CSSFontFaceRule_h
+#pragma once
 
 #include "CSSRule.h"
 
@@ -30,25 +29,25 @@ class CSSStyleDeclaration;
 class StyleRuleFontFace;
 class StyleRuleCSSStyleDeclaration;
 
-class CSSFontFaceRule : public CSSRule {
+class CSSFontFaceRule final : public CSSRule {
 public:
-    static PassRefPtr<CSSFontFaceRule> create(StyleRuleFontFace* rule, CSSStyleSheet* sheet) { return adoptRef(new CSSFontFaceRule(rule, sheet)); }
+    static Ref<CSSFontFaceRule> create(StyleRuleFontFace& rule, CSSStyleSheet* sheet) { return adoptRef(*new CSSFontFaceRule(rule, sheet)); }
 
     virtual ~CSSFontFaceRule();
 
-    virtual CSSRule::Type type() const override { return FONT_FACE_RULE; }
-    virtual String cssText() const override;
-    virtual void reattach(StyleRuleBase*) override;
-
-    CSSStyleDeclaration* style();
+    WEBCORE_EXPORT CSSStyleDeclaration& style();
 
 private:
-    CSSFontFaceRule(StyleRuleFontFace*, CSSStyleSheet* parent);
+    CSSFontFaceRule(StyleRuleFontFace&, CSSStyleSheet* parent);
+
+    CSSRule::Type type() const final { return FONT_FACE_RULE; }
+    String cssText() const final;
+    void reattach(StyleRuleBase&) final;
 
-    RefPtr<StyleRuleFontFace> m_fontFaceRule;
-    mutable RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
+    Ref<StyleRuleFontFace> m_fontFaceRule;
+    RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
 };
 
 } // namespace WebCore
 
-#endif // CSSFontFaceRule_h
+SPECIALIZE_TYPE_TRAITS_CSS_RULE(CSSFontFaceRule, CSSRule::FONT_FACE_RULE)