From 6882a04fb36642862b11efe514251d32070c3d65 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 25 Aug 2016 19:20:41 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev --- Source/WebCore/html/HTMLPreElement.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'Source/WebCore/html/HTMLPreElement.cpp') diff --git a/Source/WebCore/html/HTMLPreElement.cpp b/Source/WebCore/html/HTMLPreElement.cpp index 66b27460f..60af0de91 100644 --- a/Source/WebCore/html/HTMLPreElement.cpp +++ b/Source/WebCore/html/HTMLPreElement.cpp @@ -23,24 +23,23 @@ #include "config.h" #include "HTMLPreElement.h" -#include "Attribute.h" #include "CSSPropertyNames.h" #include "CSSValueKeywords.h" #include "HTMLNames.h" -#include "StylePropertySet.h" +#include "StyleProperties.h" namespace WebCore { using namespace HTMLNames; -inline HTMLPreElement::HTMLPreElement(const QualifiedName& tagName, Document* document) +inline HTMLPreElement::HTMLPreElement(const QualifiedName& tagName, Document& document) : HTMLElement(tagName, document) { } -PassRefPtr HTMLPreElement::create(const QualifiedName& tagName, Document* document) +Ref HTMLPreElement::create(const QualifiedName& tagName, Document& document) { - return adoptRef(new HTMLPreElement(tagName, document)); + return adoptRef(*new HTMLPreElement(tagName, document)); } bool HTMLPreElement::isPresentationAttribute(const QualifiedName& name) const @@ -50,10 +49,10 @@ bool HTMLPreElement::isPresentationAttribute(const QualifiedName& name) const return HTMLElement::isPresentationAttribute(name); } -void HTMLPreElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style) +void HTMLPreElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) { if (name == wrapAttr) - style->setProperty(CSSPropertyWhiteSpace, CSSValuePreWrap); + style.setProperty(CSSPropertyWhiteSpace, CSSValuePreWrap); else HTMLElement::collectStyleForPresentationAttribute(name, value, style); } -- cgit v1.2.1