webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 4 insertions, 5 deletions

diff --git a/Source/WebCore/html/HTMLFontElement.cpp b/Source/WebCore/html/HTMLFontElement.cpp
index 7d27ffd07..aab4d9461 100644
--- a/Source/WebCore/html/HTMLFontElement.cpp
+++ b/Source/WebCore/html/HTMLFontElement.cpp
@@ -23,7 +23,6 @@
 #include "config.h"
 #include "HTMLFontElement.h"
 
-#include "Attribute.h"
 #include "CSSPropertyNames.h"
 #include "CSSStyleSheet.h"
 #include "CSSValueKeywords.h"
@@ -46,9 +45,9 @@ HTMLFontElement::HTMLFontElement(const QualifiedName& tagName, Document& documen
     ASSERT(hasTagName(fontTag));
 }
 
-PassRefPtr<HTMLFontElement> HTMLFontElement::create(const QualifiedName& tagName, Document& document)
+Ref<HTMLFontElement> HTMLFontElement::create(const QualifiedName& tagName, Document& document)
 {
-    return adoptRef(new HTMLFontElement(tagName, document));
+    return adoptRef(*new HTMLFontElement(tagName, document));
 }
 
 // http://www.whatwg.org/specs/web-apps/current-work/multipage/rendering.html#fonts-and-colors
@@ -195,8 +194,8 @@ void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName&
     } else if (name == colorAttr)
         addHTMLColorToStyle(style, CSSPropertyColor, value);
     else if (name == faceAttr) {
-        if (RefPtr<CSSValueList> fontFaceValue = cssValuePool().createFontFaceValue(value))
-            style.setProperty(CSSProperty(CSSPropertyFontFamily, fontFaceValue.release()));
+        if (auto fontFaceValue = CSSValuePool::singleton().createFontFaceValue(value))
+            style.setProperty(CSSProperty(CSSPropertyFontFamily, WTFMove(fontFaceValue)));
     } else
         HTMLElement::collectStyleForPresentationAttribute(name, value, style);
 }