webkitgtk-2.12.3webkitgtk-2.12.3

1 files changed, 12 insertions, 11 deletions

diff --git a/Source/WebCore/html/shadow/MeterShadowElement.h b/Source/WebCore/html/shadow/MeterShadowElement.h
index a3cf162d9..7706b1df6 100644
--- a/Source/WebCore/html/shadow/MeterShadowElement.h
+++ b/Source/WebCore/html/shadow/MeterShadowElement.h
@@ -34,6 +34,7 @@
 #if ENABLE(METER_ELEMENT)
 #include "HTMLDivElement.h"
 #include <wtf/Forward.h>
+#include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
 
@@ -53,41 +54,41 @@ private:
 
 class MeterInnerElement final : public MeterShadowElement {
 public:
-    static PassRefPtr<MeterInnerElement> create(Document&);
+    static Ref<MeterInnerElement> create(Document&);
 
 private:
     MeterInnerElement(Document&);
 
     virtual bool rendererIsNeeded(const RenderStyle&) override;
-    virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>) override;
+    virtual RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) override;
 };
 
-inline PassRefPtr<MeterInnerElement> MeterInnerElement::create(Document& document)
+inline Ref<MeterInnerElement> MeterInnerElement::create(Document& document)
 {
-    return adoptRef(new MeterInnerElement(document));
+    return adoptRef(*new MeterInnerElement(document));
 }
 
 class MeterBarElement final : public MeterShadowElement {
 public:
-    static PassRefPtr<MeterBarElement> create(Document&);
+    static Ref<MeterBarElement> create(Document&);
 
 private:
     MeterBarElement(Document& document)
         : MeterShadowElement(document)
     {
-        DEFINE_STATIC_LOCAL(AtomicString, pseudoId, ("-webkit-meter-bar", AtomicString::ConstructFromLiteral));
+        static NeverDestroyed<AtomicString> pseudoId("-webkit-meter-bar", AtomicString::ConstructFromLiteral);
         setPseudo(pseudoId);
     }
 };
 
-inline PassRefPtr<MeterBarElement> MeterBarElement::create(Document& document)
+inline Ref<MeterBarElement> MeterBarElement::create(Document& document)
 {
-    return adoptRef(new MeterBarElement(document));
+    return adoptRef(*new MeterBarElement(document));
 }
 
 class MeterValueElement final : public MeterShadowElement {
 public:
-    static PassRefPtr<MeterValueElement> create(Document&);
+    static Ref<MeterValueElement> create(Document&);
     void setWidthPercentage(double);
     void updatePseudo() { setPseudo(valuePseudoId()); }
 
@@ -101,9 +102,9 @@ private:
     const AtomicString& valuePseudoId() const;
 };
 
-inline PassRefPtr<MeterValueElement> MeterValueElement::create(Document& document)
+inline Ref<MeterValueElement> MeterValueElement::create(Document& document)
 {
-    return adoptRef(new MeterValueElement(document));
+    return adoptRef(*new MeterValueElement(document));
 }
 
 }