From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/html/HTMLFontElement.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Source/WebCore/html/HTMLFontElement.cpp') 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::create(const QualifiedName& tagName, Document& document) +Ref 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 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); } -- cgit v1.2.1