webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 21 insertions, 29 deletions

diff --git a/Source/WebCore/rendering/RenderButton.h b/Source/WebCore/rendering/RenderButton.h
index 17c17615c..96bfda846 100644
--- a/Source/WebCore/rendering/RenderButton.h
+++ b/Source/WebCore/rendering/RenderButton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 Apple Computer
+ * Copyright (C) 2005 Apple Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -18,12 +18,11 @@
  *
  */
 
-#ifndef RenderButton_h
-#define RenderButton_h
+#pragma once
 
 #include "RenderFlexibleBox.h"
 #include "Timer.h"
-#include <wtf/OwnPtr.h>
+#include <memory>
 
 namespace WebCore {
 
@@ -35,56 +34,49 @@ class RenderTextFragment;
 // to date as the button changes.
 class RenderButton final : public RenderFlexibleBox {
 public:
-    RenderButton(HTMLFormControlElement&, PassRef<RenderStyle>);
+    RenderButton(HTMLFormControlElement&, RenderStyle&&);
     virtual ~RenderButton();
 
     HTMLFormControlElement& formControlElement() const;
 
-    virtual bool canBeSelectionLeaf() const override;
+    bool canBeSelectionLeaf() const override;
 
-    virtual void addChild(RenderObject* newChild, RenderObject *beforeChild = 0) override;
-    virtual void removeChild(RenderObject&) override;
-    virtual void removeLeftoverAnonymousBlock(RenderBlock*) override { }
-    virtual bool createsAnonymousWrapper() const override { return true; }
+    void addChild(RenderObject* newChild, RenderObject *beforeChild = 0) override;
+    void removeChild(RenderObject&) override;
+    void removeLeftoverAnonymousBlock(RenderBlock*) override { }
+    bool createsAnonymousWrapper() const override { return true; }
 
     void setupInnerStyle(RenderStyle*);
-    virtual void updateFromElement() override;
+    void updateFromElement() override;
 
-    virtual bool canHaveGeneratedChildren() const override;
-    virtual bool hasControlClip() const override { return true; }
-    virtual LayoutRect controlClipRect(const LayoutPoint&) const override;
+    bool canHaveGeneratedChildren() const override;
+    bool hasControlClip() const override { return true; }
+    LayoutRect controlClipRect(const LayoutPoint&) const override;
 
     void setText(const String&);
     String text() const;
 
 #if PLATFORM(IOS)
-    virtual void layout() override;
+    void layout() override;
 #endif
 
 private:
     void element() const = delete;
 
-    virtual const char* renderName() const override { return "RenderButton"; }
-    virtual bool isRenderButton() const override { return true; }
+    const char* renderName() const override { return "RenderButton"; }
+    bool isRenderButton() const override { return true; }
 
-    virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) override;
-    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
+    void styleWillChange(StyleDifference, const RenderStyle& newStyle) override;
+    void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
 
-    virtual bool hasLineIfEmpty() const override;
+    bool hasLineIfEmpty() const override;
 
-    virtual bool requiresForcedStyleRecalcPropagation() const override { return true; }
-
-    void timerFired(Timer<RenderButton>&);
+    bool isFlexibleBoxImpl() const override { return true; }
 
     RenderTextFragment* m_buttonText;
     RenderBlock* m_inner;
-
-    OwnPtr<Timer<RenderButton>> m_timer;
-    bool m_default;
 };
 
-RENDER_OBJECT_TYPE_CASTS(RenderButton, isRenderButton())
-
 } // namespace WebCore
 
-#endif // RenderButton_h
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderButton, isRenderButton())