webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 10 insertions, 10 deletions

diff --git a/Source/WebCore/rendering/RenderTextControlMultiLine.h b/Source/WebCore/rendering/RenderTextControlMultiLine.h
index 192b782cd..42ff33194 100644
--- a/Source/WebCore/rendering/RenderTextControlMultiLine.h
+++ b/Source/WebCore/rendering/RenderTextControlMultiLine.h
@@ -30,7 +30,7 @@ class HTMLTextAreaElement;
 
 class RenderTextControlMultiLine final : public RenderTextControl {
 public:
-    RenderTextControlMultiLine(HTMLTextAreaElement&, Ref<RenderStyle>&&);
+    RenderTextControlMultiLine(HTMLTextAreaElement&, PassRef<RenderStyle>);
     virtual ~RenderTextControlMultiLine();
 
     HTMLTextAreaElement& textAreaElement() const;
@@ -38,21 +38,21 @@ public:
 private:
     void element() const = delete;
 
-    virtual bool isTextArea() const override { return true; }
+    virtual bool isTextArea() const { return true; }
 
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
 
-    virtual float getAverageCharWidth() override;
-    virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const override;
+    virtual float getAvgCharWidth(AtomicString family);
+    virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const;
     virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const override;
-    virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
+    virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
 
-    virtual Ref<RenderStyle> createInnerTextStyle(const RenderStyle* startStyle) const override;
-    virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren) override;
+    virtual PassRef<RenderStyle> createInnerTextStyle(const RenderStyle* startStyle) const;
+    virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren);
 };
 
-} // namespace WebCore
+RENDER_OBJECT_TYPE_CASTS(RenderTextControlMultiLine, isTextArea())
 
-SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderTextControlMultiLine, isTextArea())
+}
 
-#endif // RenderTextControlMultiLine_h
+#endif