webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 13 insertions, 12 deletions

diff --git a/Source/WebCore/rendering/mathml/RenderMathMLScripts.h b/Source/WebCore/rendering/mathml/RenderMathMLScripts.h
index 1c94cc49d..e3225b843 100644
--- a/Source/WebCore/rendering/mathml/RenderMathMLScripts.h
+++ b/Source/WebCore/rendering/mathml/RenderMathMLScripts.h
@@ -35,7 +35,7 @@ namespace WebCore {
     
 class RenderMathMLScripts;
 
-class RenderMathMLScriptsWrapper final : public RenderMathMLBlock {
+class RenderMathMLScriptsWrapper : public RenderMathMLBlock {
 
 friend class RenderMathMLScripts;
 
@@ -46,8 +46,8 @@ public:
     virtual void removeChild(RenderObject&) override;
 
 private:
-    RenderMathMLScriptsWrapper(Document& document, Ref<RenderStyle>&& style, WrapperType kind)
-        : RenderMathMLBlock(document, WTFMove(style))
+    RenderMathMLScriptsWrapper(Document& document, PassRef<RenderStyle> style, WrapperType kind)
+        : RenderMathMLBlock(document, std::move(style))
         , m_kind(kind)
     {
     }
@@ -65,27 +65,29 @@ private:
     WrapperType m_kind;
 };
 
+RENDER_OBJECT_TYPE_CASTS(RenderMathMLScriptsWrapper, isRenderMathMLScriptsWrapper());
+
 // Render a base with scripts.
-class RenderMathMLScripts final : public RenderMathMLBlock {
+class RenderMathMLScripts : public RenderMathMLBlock {
 
 friend class RenderMathMLScriptsWrapper;
 
 public:
-    RenderMathMLScripts(Element&, Ref<RenderStyle>&&);
+    RenderMathMLScripts(Element&, PassRef<RenderStyle>);
     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
     virtual void removeChild(RenderObject&) override;
     
-    virtual RenderMathMLOperator* unembellishedOperator() override;
-    virtual Optional<int> firstLineBaseline() const override;
+    virtual RenderMathMLOperator* unembellishedOperator();
+    virtual int firstLineBaseline() const override;
 
 protected:
-    virtual void layout() override;
+    virtual void layout();
     
 private:
     void addChildInternal(bool normalInsertion, RenderObject* child, RenderObject* beforeChild = 0);
     void removeChildInternal(bool normalRemoval, RenderObject& child);
 
-    virtual bool isRenderMathMLScripts() const override { return true; }
+    virtual bool isRenderMathMLScripts() const override final { return true; }
     virtual const char* renderName() const override { return "RenderMathMLScripts"; }
 
     void fixAnonymousStyleForSubSupPair(RenderObject* subSupPair, bool isPostScript);
@@ -103,10 +105,9 @@ private:
     RenderMathMLScriptsWrapper* m_baseWrapper;
 };
 
-} // namespace WebCore
+RENDER_OBJECT_TYPE_CASTS(RenderMathMLScripts, isRenderMathMLScripts());
 
-SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLScriptsWrapper, isRenderMathMLScriptsWrapper())
-SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLScripts, isRenderMathMLScripts())
+}
 
 #endif // ENABLE(MATHML)