Changeset 51000 in webkit

Timestamp:

Nov 15, 2009 3:15:07 PM (14 years ago)

Author:

dbates@webkit.org

Message:

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

No review, rolling out r50999.
​http://trac.webkit.org/changeset/50999

Need to fix some issues in the Windows build. Missed some places where
RenderTextControl::isEdited is called.

• 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::setUserEdited): (WebCore::RenderTextControl::subtreeHasChanged):
• rendering/RenderTextControl.h: (WebCore::RenderTextControl::isEdited): (WebCore::RenderTextControl::setEdited): (WebCore::RenderTextControl::isUserEdited):
• 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>
+
+        No review, rolling out r50999.
+        http://trac.webkit.org/changeset/50999
+
+        Need to fix some issues in the Windows build. Missed some places where
+        RenderTextControl::isEdited is called.
+
+        * 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::setUserEdited):
+        (WebCore::RenderTextControl::subtreeHasChanged):
+        * rendering/RenderTextControl.h:
+        (WebCore::RenderTextControl::isEdited):
+        (WebCore::RenderTextControl::setEdited):
+        (WebCore::RenderTextControl::isUserEdited):
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::subtreeHasChanged):
+        * wml/WMLInputElement.cpp:
+        (WebCore::WMLInputElement::defaultEventHandler):
+
 2009-11-15  Daniel Bates  <dbates@webkit.org>
 

trunk/WebCore/bindings/objc/DOMHTML.mm

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

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)->wasChangedSinceLastChangeEvent()) {
+        if (r && r->isTextControl() && toRenderTextControl(r)->isEdited()) {
             oldFocusedNode->dispatchEvent(Event::create(eventNames().changeEvent, true, false));
             r = oldFocusedNode->renderer();
             if (r && r->isTextControl())
-                toRenderTextControl(r)->setChangedSinceLastChangeEvent(false);
+                toRenderTextControl(r)->setEdited(false);
         }
 

trunk/WebCore/html/HTMLInputElement.cpp

@@ -1585 +1585 @@
         // Fire onChange for text fields.
         RenderObject* r = renderer();
-        if (r && r->isTextField() && toRenderTextControl(r)->wasChangedSinceLastChangeEvent()) {
+        if (r && r->isTextField() && toRenderTextControl(r)->isEdited()) {
             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)->setChangedSinceLastChangeEvent(false);
+                toRenderTextControl(r)->setEdited(false);
         }
 

trunk/WebCore/rendering/RenderTextControl.cpp

@@ -71 +71 @@
     : RenderBlock(node)
     , m_placeholderVisible(placeholderVisible)
-    , m_wasChangedSinceLastChangeEvent(false)
-    , m_lastChangeWasUserEdit(false)
+    , m_edited(false)
+    , m_userEdited(false)
 {
 }
@@ -196 +196 @@
         }
 
-        m_lastChangeWasUserEdit = false;
+        // 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;
     }
 
@@ -202 +203 @@
 }
 
-void RenderTextControl::setLastChangeWasUserEdit(bool lastChangeWasUserEdit)
-{
-    m_lastChangeWasUserEdit = lastChangeWasUserEdit;
-    document()->setIgnoreAutofocus(lastChangeWasUserEdit);
+void RenderTextControl::setUserEdited(bool isUserEdited)
+{
+    m_userEdited = isUserEdited;
+    document()->setIgnoreAutofocus(isUserEdited);
 }
 
@@ -312 +313 @@
 void RenderTextControl::subtreeHasChanged()
 {
-    m_wasChangedSinceLastChangeEvent = true;
-    m_lastChangeWasUserEdit = true;
+    m_edited = true;
+    m_userEdited = true;
 }
 

trunk/WebCore/rendering/RenderTextControl.h

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

trunk/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -151 +151 @@
 void RenderTextControlSingleLine::subtreeHasChanged()
 {
-    bool wasChanged = wasChangedSinceLastChangeEvent();
+    bool wasEdited = isEdited();
     RenderTextControl::subtreeHasChanged();
 
@@ -168 +168 @@
         startSearchEventTimer();
 
-    if (!wasChanged && node()->focused()) {
+    if (!wasEdited && 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)->wasChangedSinceLastChangeEvent()) {
+        if (r && toRenderTextControl(r)->isEdited()) {
             dispatchEvent(eventNames().changeEvent, true, false);
             
@@ -287 +287 @@
             r = renderer();
             if (r)
-                toRenderTextControl(r)->setChangedSinceLastChangeEvent(false);
+                toRenderTextControl(r)->setEdited(false);
         }