webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 11 insertions, 12 deletions

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