Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / HTMLFormControlElement.h

diff --git a/src/third_party/WebKit/Source/core/html/HTMLFormControlElement.h b/src/third_party/WebKit/Source/core/html/HTMLFormControlElement.h
index 8cfc90c..44d3315 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/HTMLFormControlElement.h
+++ b/src/third_party/WebKit/Source/core/html/HTMLFormControlElement.h
@@ -56,10 +56,10 @@ public:
     virtual bool formControlValueMatchesRenderer() const { return m_valueMatchesRenderer; }
     virtual void setFormControlValueMatchesRenderer(bool b) { m_valueMatchesRenderer = b; }
 
-    virtual bool wasChangedSinceLastFormControlChangeEvent() const OVERRIDE FINAL;
-    virtual void setChangedSinceLastFormControlChangeEvent(bool) OVERRIDE FINAL;
+    bool wasChangedSinceLastFormControlChangeEvent() const { return m_wasChangedSinceLastFormControlChangeEvent; }
+    void setChangedSinceLastFormControlChangeEvent(bool);
 
-    virtual void dispatchFormControlChangeEvent() OVERRIDE;
+    virtual void dispatchFormControlChangeEvent();
     void dispatchChangeEvent();
     void dispatchFormControlInputEvent();
 
@@ -73,7 +73,7 @@ public:
 
     const AtomicString& type() const { return formControlType(); }
 
-    virtual const AtomicString& formControlType() const OVERRIDE = 0;
+    virtual const AtomicString& formControlType() const = 0;
 
     virtual bool canTriggerImplicitSubmission() const { return false; }
 
@@ -109,6 +109,8 @@ public:
 
     String nameForAutofill() const;
 
+    virtual void setFocus(bool flag) OVERRIDE;
+
     using Node::ref;
     using Node::deref;
 
@@ -127,7 +129,7 @@ protected:
     virtual bool isKeyboardFocusable() const OVERRIDE;
     virtual bool shouldShowFocusRingOnMouseFocus() const;
     virtual bool shouldHaveFocusAppearance() const OVERRIDE FINAL;
-    virtual void dispatchFocusEvent(Element* oldFocusedElement, FocusDirection) OVERRIDE;
+    virtual void dispatchFocusEvent(Element* oldFocusedElement, FocusType) OVERRIDE;
     virtual void dispatchBlurEvent(Element* newFocusedElement) OVERRIDE;
     virtual void willCallDefaultEventHandler(const Event&) OVERRIDE FINAL;