Changeset 94009 in webkit

Timestamp:

Aug 29, 2011, 1:18:46 PM (15 years ago)

Author:

rniwa@webkit.org

Message:

Cleanup: notifyFormStateChanged, formControlValueMatchesRenderer, and setFormControlValueMatchesRenderer
​https://bugs.webkit.org/show_bug.cgi?id=67141

Reviewed by Eric Seidel.

No new tests since this is a refactoring.

• dom/Element.h: Removed formControlValueMatchesRenderer and setFormControlValueMatchesRenderer.
• html/HTMLInputElement.cpp: Removed notifyFormStateChanged.
• html/HTMLInputElement.h:
• html/HTMLTextAreaElement.cpp:

(WebCore::HTMLTextAreaElement::updateValue): Calls notifyFormStateChanged; modifies m_wasModifiedByUser.
(WebCore::HTMLTextAreaElement::setValueCommon): Calls notifyFormStateChanged; also renamed value to newValue
to avoid the conflict with value().

• html/HTMLTextAreaElement.h: Made m_wasModifiedByUser mutable.
• html/HTMLTextFormControlElement.cpp:

(WebCore::HTMLTextFormControlElement::notifyFormStateChanged): Extracted from notifyFormStateChanged in
HTMLInputElement.cpp and HTMLTextAreaElement.cpp.

• html/HTMLTextFormControlElement.h:
• rendering/RenderTextControl.cpp:

(WebCore::RenderTextControl::setInnerTextValue): Calls setFormControlValueMatchesRenderer.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• html/HTMLInputElement.cpp (modified) (4 diffs)
• html/HTMLInputElement.h (modified) (1 diff)
• html/HTMLTextAreaElement.cpp (modified) (6 diffs)
• html/HTMLTextAreaElement.h (modified) (1 diff)
• html/HTMLTextFormControlElement.cpp (modified) (3 diffs)
• html/HTMLTextFormControlElement.h (modified) (1 diff)
• rendering/RenderTextControl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-29  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Cleanup: notifyFormStateChanged, formControlValueMatchesRenderer, and setFormControlValueMatchesRenderer
+        https://bugs.webkit.org/show_bug.cgi?id=67141
+
+        Reviewed by Eric Seidel.
+
+        No new tests since this is a refactoring.
+
+        * dom/Element.h: Removed formControlValueMatchesRenderer and setFormControlValueMatchesRenderer.
+        * html/HTMLInputElement.cpp: Removed notifyFormStateChanged.
+        * html/HTMLInputElement.h:
+        * html/HTMLTextAreaElement.cpp:
+        (WebCore::HTMLTextAreaElement::updateValue): Calls notifyFormStateChanged; modifies m_wasModifiedByUser.
+        (WebCore::HTMLTextAreaElement::setValueCommon): Calls notifyFormStateChanged; also renamed value to newValue
+        to avoid the conflict with value().
+        * html/HTMLTextAreaElement.h: Made m_wasModifiedByUser mutable.
+        * html/HTMLTextFormControlElement.cpp:
+        (WebCore::HTMLTextFormControlElement::notifyFormStateChanged): Extracted from notifyFormStateChanged in
+        HTMLInputElement.cpp and HTMLTextAreaElement.cpp.
+        * html/HTMLTextFormControlElement.h:
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::setInnerTextValue): Calls setFormControlValueMatchesRenderer.
+
 2011-08-29  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/dom/Element.h

@@ -338 +338 @@
     virtual bool canContainRangeEndPoint() const { return true; }
 
-    virtual bool formControlValueMatchesRenderer() const { return false; }
-    virtual void setFormControlValueMatchesRenderer(bool) { }
-
     virtual const AtomicString& formControlName() const { return nullAtom; }
     virtual const AtomicString& formControlType() const { return nullAtom; }

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -30 +30 @@
 
 #include "AXObjectCache.h"
-#include "Attribute.h"
 #include "BeforeTextInsertedEvent.h"
-#include "Chrome.h"
-#include "ChromeClient.h"
 #include "CSSPropertyNames.h"
 #include "Document.h"
@@ -46 +43 @@
 #include "HTMLOptionElement.h"
 #include "HTMLParserIdioms.h"
-#include "Icon.h"
 #include "InputType.h"
 #include "KeyboardEvent.h"
@@ -52 +48 @@
 #include "MouseEvent.h"
 #include "NumberInputType.h"
-#include "Page.h"
-#include "PlatformMouseEvent.h"
 #include "RenderTextControlSingleLine.h"
 #include "RenderTheme.h"
@@ -1910 +1904 @@
 }
 
-void HTMLInputElement::notifyFormStateChanged()
-{
-    Frame* frame = document()->frame();
-    if (!frame)
-        return;
-
-    if (Page* page = frame->page())
-        page->chrome()->client()->formStateDidChange(this);
-}
-
 void HTMLInputElement::parseMaxLengthAttribute(Attribute* attribute)
 {

trunk/Source/WebCore/html/HTMLInputElement.h

@@ -230 +230 @@
 
     bool lastChangeWasUserEdit() const;
-    void notifyFormStateChanged();
 
     static const int maximumLength;

trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

@@ -30 +30 @@
 #include "BeforeTextInsertedEvent.h"
 #include "CSSValueKeywords.h"
-#include "Chrome.h"
-#include "ChromeClient.h"
 #include "Document.h"
 #include "Event.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
-#include "FocusController.h"
 #include "FormDataList.h"
 #include "Frame.h"
 #include "HTMLNames.h"
-#include "Page.h"
 #include "RenderStyle.h"
 #include "RenderTextControlMultiLine.h"
-#include "ScriptEventListener.h"
 #include "ShadowRoot.h"
 #include "Text.h"
 #include "TextControlInnerElements.h"
 #include "TextIterator.h"
-#include "VisibleSelection.h"
 #include <wtf/StdLibExtras.h>
 
@@ -57 +51 @@
 static const int defaultRows = 2;
 static const int defaultCols = 20;
-
-static inline void notifyFormStateChanged(const HTMLTextAreaElement* element)
-{
-    Frame* frame = element->document()->frame();
-    if (!frame)
-        return;
-    frame->page()->chrome()->client()->formStateDidChange(element);
-}
 
 HTMLTextAreaElement::HTMLTextAreaElement(const QualifiedName& tagName, Document* document, HTMLFormElement* form)
@@ -307 +293 @@
     m_value = toRenderTextControl(renderer())->text();
     const_cast<HTMLTextAreaElement*>(this)->setFormControlValueMatchesRenderer(true);
-    notifyFormStateChanged(this);
+    const_cast<HTMLTextAreaElement*>(this)->notifyFormStateChanged();
     m_isDirty = true;
-    const_cast<HTMLTextAreaElement*>(this)->m_wasModifiedByUser = true;
+    m_wasModifiedByUser = true;
     const_cast<HTMLTextAreaElement*>(this)->updatePlaceholderVisibility(false);
 }
@@ -333 +319 @@
 }
 
-void HTMLTextAreaElement::setValueCommon(const String& value)
+void HTMLTextAreaElement::setValueCommon(const String& newValue)
 {
     m_wasModifiedByUser = false;
     // Code elsewhere normalizes line endings added by the user via the keyboard or pasting.
     // We normalize line endings coming from JavaScript here.
-    String normalizedValue = value.isNull() ? "" : value;
+    String normalizedValue = newValue.isNull() ? "" : newValue;
     normalizedValue.replace("\r\n", "\n");
     normalizedValue.replace('\r', '\n');
@@ -344 +330 @@
     // Return early because we don't want to move the caret or trigger other side effects
     // when the value isn't changing. This matches Firefox behavior, at least.
-    if (normalizedValue == this->value())
+    if (normalizedValue == value())
         return;
 
@@ -358 +344 @@
     }
 
-    notifyFormStateChanged(this);
+    notifyFormStateChanged();
     setTextAsOfLastFormControlChangeEvent(normalizedValue);
 }

trunk/Source/WebCore/html/HTMLTextAreaElement.h

@@ -114 +114 @@
     mutable String m_value;
     mutable bool m_isDirty;
-    bool m_wasModifiedByUser;
+    mutable bool m_wasModifiedByUser;
 };
 

trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp

@@ -27 +27 @@
 
 #include "Attribute.h"
+#include "Chrome.h"
+#include "ChromeClient.h"
 #include "Document.h"
 #include "Event.h"
@@ -34 +36 @@
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
+#include "Page.h"
 #include "RenderBox.h"
 #include "RenderTextControl.h"
@@ -434 +437 @@
 }
 
+void HTMLTextFormControlElement::notifyFormStateChanged()
+{
+    Frame* frame = document()->frame();
+    if (!frame)
+        return;
+    
+    if (Page* page = frame->page())
+        page->chrome()->client()->formStateDidChange(this);
+}
+
 HTMLTextFormControlElement* enclosingTextFormControl(const Position& position)
 {

trunk/Source/WebCore/html/HTMLTextFormControlElement.h

@@ -75 +75 @@
 
     void selectionChanged(bool userTriggered);
+    void notifyFormStateChanged();
 
 protected:

trunk/Source/WebCore/rendering/RenderTextControl.cpp

@@ -172 +172 @@
     }
 
-    static_cast<Element*>(node())->setFormControlValueMatchesRenderer(true);
+    textFormControlElement()->setFormControlValueMatchesRenderer(true);
 }