webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 9 insertions, 10 deletions

diff --git a/Source/WebCore/html/HTMLBRElement.cpp b/Source/WebCore/html/HTMLBRElement.cpp
index 5eea85ae9..db1f0ccfc 100644
--- a/Source/WebCore/html/HTMLBRElement.cpp
+++ b/Source/WebCore/html/HTMLBRElement.cpp
@@ -23,7 +23,6 @@
 #include "config.h"
 #include "HTMLBRElement.h"
 
-#include "Attribute.h"
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
 #include "HTMLNames.h"
@@ -39,14 +38,14 @@ HTMLBRElement::HTMLBRElement(const QualifiedName& tagName, Document& document)
     ASSERT(hasTagName(brTag));
 }
 
-PassRefPtr<HTMLBRElement> HTMLBRElement::create(Document& document)
+Ref<HTMLBRElement> HTMLBRElement::create(Document& document)
 {
-    return adoptRef(new HTMLBRElement(brTag, document));
+    return adoptRef(*new HTMLBRElement(brTag, document));
 }
 
-PassRefPtr<HTMLBRElement> HTMLBRElement::create(const QualifiedName& tagName, Document& document)
+Ref<HTMLBRElement> HTMLBRElement::create(const QualifiedName& tagName, Document& document)
 {
-    return adoptRef(new HTMLBRElement(tagName, document));
+    return adoptRef(*new HTMLBRElement(tagName, document));
 }
 
 bool HTMLBRElement::isPresentationAttribute(const QualifiedName& name) const
@@ -62,7 +61,7 @@ void HTMLBRElement::collectStyleForPresentationAttribute(const QualifiedName& na
         // If the string is empty, then don't add the clear property.
         // <br clear> and <br clear=""> are just treated like <br> by Gecko, Mac IE, etc. -dwh
         if (!value.isEmpty()) {
-            if (equalIgnoringCase(value, "all"))
+            if (equalLettersIgnoringASCIICase(value, "all"))
                 addPropertyToPresentationAttributeStyle(style, CSSPropertyClear, CSSValueBoth);
             else
                 addPropertyToPresentationAttributeStyle(style, CSSPropertyClear, value);
@@ -71,12 +70,12 @@ void HTMLBRElement::collectStyleForPresentationAttribute(const QualifiedName& na
         HTMLElement::collectStyleForPresentationAttribute(name, value, style);
 }
 
-RenderPtr<RenderElement> HTMLBRElement::createElementRenderer(PassRef<RenderStyle> style)
+RenderPtr<RenderElement> HTMLBRElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
 {
-    if (style.get().hasContent())
-        return RenderElement::createFor(*this, std::move(style));
+    if (style.hasContent())
+        return RenderElement::createFor(*this, WTFMove(style));
 
-    return createRenderer<RenderLineBreak>(*this, std::move(style));
+    return createRenderer<RenderLineBreak>(*this, WTFMove(style));
 }
 
 }