webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 10 insertions, 16 deletions

diff --git a/Source/WebCore/rendering/RenderFileUploadControl.h b/Source/WebCore/rendering/RenderFileUploadControl.h
index b13fb8163..910a8a024 100644
--- a/Source/WebCore/rendering/RenderFileUploadControl.h
+++ b/Source/WebCore/rendering/RenderFileUploadControl.h
@@ -18,8 +18,7 @@
  *
  */
 
-#ifndef RenderFileUploadControl_h
-#define RenderFileUploadControl_h
+#pragma once
 
 #include "RenderBlockFlow.h"
 
@@ -33,7 +32,7 @@ class HTMLInputElement;
 
 class RenderFileUploadControl final : public RenderBlockFlow {
 public:
-    RenderFileUploadControl(HTMLInputElement&, PassRef<RenderStyle>);
+    RenderFileUploadControl(HTMLInputElement&, RenderStyle&&);
     virtual ~RenderFileUploadControl();
 
     String buttonValue();
@@ -44,29 +43,24 @@ public:
 private:
     void element() const = delete;
 
-    virtual bool isFileUploadControl() const override { return true; }
+    bool isFileUploadControl() const override { return true; }
 
-    virtual const char* renderName() const override { return "RenderFileUploadControl"; }
+    const char* renderName() const override { return "RenderFileUploadControl"; }
 
-    virtual bool canBeReplacedWithInlineRunIn() const override;
-    virtual void updateFromElement() override;
-    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
-    virtual void computePreferredLogicalWidths() override;
-    virtual void paintObject(PaintInfo&, const LayoutPoint&) override;
-
-    virtual bool requiresForcedStyleRecalcPropagation() const override { return true; }
+    void updateFromElement() override;
+    void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
+    void computePreferredLogicalWidths() override;
+    void paintObject(PaintInfo&, const LayoutPoint&) override;
 
     int maxFilenameWidth() const;
     
-    virtual VisiblePosition positionForPoint(const LayoutPoint&) override;
+    VisiblePosition positionForPoint(const LayoutPoint&, const RenderRegion*) override;
 
     HTMLInputElement* uploadButton() const;
 
     bool m_canReceiveDroppedFiles;
 };
 
-RENDER_OBJECT_TYPE_CASTS(RenderFileUploadControl, isFileUploadControl())
-
 } // namespace WebCore
 
-#endif // RenderFileUploadControl_h
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderFileUploadControl, isFileUploadControl())