Changeset 50999 in webkit

Timestamp:

Nov 15, 2009 2:55:41 PM (14 years ago)

Author:

dbates@webkit.org

Message:

2009-11-15 Daniel Bates <​dbates@webkit.org>

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=31186

Renames RenderTextControl::m_edited and RenderTextControl::m_userEdited to
m_wasChangedSinceLastChangeEvent and m_lastChangeWasUserEdit, respectively.
These are more descriptive names so as to clear an ambiguity surrounding
their usage. Also, renames associated setters and getters so that they
coincide with the renamed fields.

No functionality was changed. So, no tests were included.

• bindings/objc/DOMHTML.mm: (-[DOMHTMLInputElement _isEdited]): (-[DOMHTMLTextAreaElement _isEdited]):
• dom/Document.cpp: (WebCore::Document::setFocusedNode):
• html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::defaultEventHandler):
• rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::RenderTextControl): (WebCore::RenderTextControl::setInnerTextValue): (WebCore::RenderTextControl::setLastChangeWasUserEdit): Formerly named setUserEdited. (WebCore::RenderTextControl::subtreeHasChanged):
• rendering/RenderTextControl.h: (WebCore::RenderTextControl::wasChangedSinceLastChangeEvent): Formerly named isEdited. (WebCore::RenderTextControl::setChangedSinceLastChangeEvent): Formerly named setEdited. (WebCore::RenderTextControl::lastChangeWasUserEdit): Formerly named setUserEdited.
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::subtreeHasChanged):
• wml/WMLInputElement.cpp: (WebCore::WMLInputElement::defaultEventHandler):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/objc/DOMHTML.mm (modified) (2 diffs)
• dom/Document.cpp (modified) (1 diff)
• html/HTMLInputElement.cpp (modified) (1 diff)
• rendering/RenderTextControl.cpp (modified) (4 diffs)
• rendering/RenderTextControl.h (modified) (2 diffs)
• rendering/RenderTextControlSingleLine.cpp (modified) (2 diffs)
• wml/WMLInputElement.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-15  Daniel Bates  <dbates@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31186
+
+        Renames RenderTextControl::m_edited and RenderTextControl::m_userEdited to
+        m_wasChangedSinceLastChangeEvent and m_lastChangeWasUserEdit, respectively.
+        These are more descriptive names so as to clear an ambiguity surrounding
+        their usage. Also, renames associated setters and getters so that they
+        coincide with the renamed fields.
+
+        No functionality was changed. So, no tests were included.
+
+        * bindings/objc/DOMHTML.mm:
+        (-[DOMHTMLInputElement _isEdited]):
+        (-[DOMHTMLTextAreaElement _isEdited]):
+        * dom/Document.cpp:
+        (WebCore::Document::setFocusedNode):
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::defaultEventHandler):
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::RenderTextControl):
+        (WebCore::RenderTextControl::setInnerTextValue):
+        (WebCore::RenderTextControl::setLastChangeWasUserEdit): Formerly named setUserEdited.
+        (WebCore::RenderTextControl::subtreeHasChanged):
+        * rendering/RenderTextControl.h:
+        (WebCore::RenderTextControl::wasChangedSinceLastChangeEvent): Formerly named isEdited.
+        (WebCore::RenderTextControl::setChangedSinceLastChangeEvent): Formerly named setEdited.
+        (WebCore::RenderTextControl::lastChangeWasUserEdit): Formerly named setUserEdited.
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::subtreeHasChanged):
+        * wml/WMLInputElement.cpp:
+        (WebCore::WMLInputElement::defaultEventHandler):
+
 2009-11-14  Adele Peterson  <adele@apple.com>
 

trunk/WebCore/bindings/objc/DOMHTML.mm

@@ -168 +168 @@
 {
     WebCore::RenderObject *renderer = core(self)->renderer();
-    return renderer && [self _isTextField] && static_cast<WebCore::RenderTextControl *>(renderer)->isUserEdited();
+    return renderer && [self _isTextField] && static_cast<WebCore::RenderTextControl *>(renderer)->lastChangeWasUserEdit();
 }
 
@@ -178 +178 @@
 {
     WebCore::RenderObject* renderer = core(self)->renderer();
-    return renderer && static_cast<WebCore::RenderTextControl*>(renderer)->isUserEdited();
+    return renderer && static_cast<WebCore::RenderTextControl*>(renderer)->lastChangeWasUserEdit();
 }
 

trunk/WebCore/dom/Document.cpp

@@ -2656 +2656 @@
         // Dispatch a change event for text fields or textareas that have been edited
         RenderObject* r = oldFocusedNode->renderer();
-        if (r && r->isTextControl() && toRenderTextControl(r)->isEdited()) {
+        if (r && r->isTextControl() && toRenderTextControl(r)->wasChangedSinceLastChangeEvent()) {
             oldFocusedNode->dispatchEvent(Event::create(eventNames().changeEvent, true, false));
             r = oldFocusedNode->renderer();
             if (r && r->isTextControl())
-                toRenderTextControl(r)->setEdited(false);
+                toRenderTextControl(r)->setChangedSinceLastChangeEvent(false);
         }
 

trunk/WebCore/html/HTMLInputElement.cpp

@@ -1585 +1585 @@
         // Fire onChange for text fields.
         RenderObject* r = renderer();
-        if (r && r->isTextField() && toRenderTextControl(r)->isEdited()) {
+        if (r && r->isTextField() && toRenderTextControl(r)->wasChangedSinceLastChangeEvent()) {
             dispatchFormControlChangeEvent();
             // Refetch the renderer since arbitrary JS code run during onchange can do anything, including destroying it.
             r = renderer();
             if (r && r->isTextField())
-                toRenderTextControl(r)->setEdited(false);
+                toRenderTextControl(r)->setChangedSinceLastChangeEvent(false);
         }
 

trunk/WebCore/rendering/RenderTextControl.cpp

@@ -71 +71 @@
     : RenderBlock(node)
     , m_placeholderVisible(placeholderVisible)
-    , m_edited(false)
-    , m_userEdited(false)
+    , m_wasChangedSinceLastChangeEvent(false)
+    , m_lastChangeWasUserEdit(false)
 {
 }
@@ -196 +196 @@
         }
 
-        // We set m_userEdited to false since this change was not explicty made by the user (say, via typing on the keyboard), see <rdar://problem/5359921>.
-        m_userEdited = false;
+        m_lastChangeWasUserEdit = false;
     }
 
@@ -203 +202 @@
 }
 
-void RenderTextControl::setUserEdited(bool isUserEdited)
-{
-    m_userEdited = isUserEdited;
-    document()->setIgnoreAutofocus(isUserEdited);
+void RenderTextControl::setLastChangeWasUserEdit(bool lastChangeWasUserEdit)
+{
+    m_lastChangeWasUserEdit = lastChangeWasUserEdit;
+    document()->setIgnoreAutofocus(lastChangeWasUserEdit);
 }
 
@@ -313 +312 @@
 void RenderTextControl::subtreeHasChanged()
 {
-    m_edited = true;
-    m_userEdited = true;
+    m_wasChangedSinceLastChangeEvent = true;
+    m_lastChangeWasUserEdit = true;
 }
 

trunk/WebCore/rendering/RenderTextControl.h

@@ -35 +35 @@
     virtual ~RenderTextControl();
 
-    bool isEdited() const { return m_edited; }
-    void setEdited(bool isEdited) { m_edited = isEdited; }
+    bool wasChangedSinceLastChangeEvent() const { return m_wasChangedSinceLastChangeEvent; }
+    void setChangedSinceLastChangeEvent(bool wasChangedSinceLastChangeEvent) { m_wasChangedSinceLastChangeEvent = wasChangedSinceLastChangeEvent; }
 
-    bool isUserEdited() const { return m_userEdited; }
-    void setUserEdited(bool isUserEdited);
+    bool lastChangeWasUserEdit() const { return m_lastChangeWasUserEdit; }
+    void setLastChangeWasUserEdit(bool lastChangeWasUserEdit);
 
     int selectionStart();
@@ -106 +106 @@
     String finishText(Vector<UChar>&) const;
 
-    bool m_edited;
-    bool m_userEdited;
+    bool m_wasChangedSinceLastChangeEvent;
+    bool m_lastChangeWasUserEdit;
     RefPtr<TextControlInnerTextElement> m_innerText;
 };

trunk/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -151 +151 @@
 void RenderTextControlSingleLine::subtreeHasChanged()
 {
-    bool wasEdited = isEdited();
+    bool wasChanged = wasChangedSinceLastChangeEvent();
     RenderTextControl::subtreeHasChanged();
 
@@ -168 +168 @@
         startSearchEventTimer();
 
-    if (!wasEdited && node()->focused()) {
+    if (!wasChanged && node()->focused()) {
         if (Frame* frame = document()->frame())
             frame->textFieldDidBeginEditing(static_cast<Element*>(node()));

trunk/WebCore/wml/WMLInputElement.cpp

@@ -281 +281 @@
         // Fire onChange for text fields.
         RenderObject* r = renderer();
-        if (r && toRenderTextControl(r)->isEdited()) {
+        if (r && toRenderTextControl(r)->wasChangedSinceLastChangeEvent()) {
             dispatchEvent(eventNames().changeEvent, true, false);
             
@@ -287 +287 @@
             r = renderer();
             if (r)
-                toRenderTextControl(r)->setEdited(false);
+                toRenderTextControl(r)->setChangedSinceLastChangeEvent(false);
         }