Changeset 94068 in webkit

Timestamp:

Aug 30, 2011, 4:23:24 AM (15 years ago)

Author:

rniwa@webkit.org

Message:

lastChangeWasUserEdit continues to return true when innerText or textContent is modified
​https://bugs.webkit.org/show_bug.cgi?id=67183

Reviewed by Kent Tamura.

Source/WebCore:

Fixed the bug by calling setLastChangeWasNotUserEdit in HTMLTextAreaElement::childrenChanged.

Also got rid of HTMLTextFormControlElement::subtreeHasChanged because it was a needless indirection.

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::subtreeHasChanged): No longer calls HTMLTextFormControlElement::subtreeHasChanged.

• html/HTMLTextAreaElement.cpp:

(WebCore::HTMLTextAreaElement::childrenChanged): Calls setLastChangeWasNotUserEdit.
(WebCore::HTMLTextAreaElement::subtreeHasChanged): No longer calls HTMLTextFormControlElement::subtreeHasChanged.

• html/HTMLTextFormControlElement.cpp:

(WebCore::HTMLTextFormControlElement::defaultEventHandler): Merged subtreeHasChanged.
(WebCore::HTMLTextFormControlElement::setInnerTextValue): No longer set m_lastChangeWasUserEdit to false
since this is now done when renderers are set dirty.

• html/HTMLTextFormControlElement.h: Made subtreeHasChanged a pure virtual function.

LayoutTests:

Two test cases now pass.

• fast/forms/textfield-lastchange-was-useredit-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/textfield-lastchange-was-useredit-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLInputElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLTextAreaElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLTextFormControlElement.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLTextFormControlElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-30  Ryosuke Niwa  <rniwa@webkit.org>
+
+        lastChangeWasUserEdit continues to return true when innerText or textContent is modified
+        https://bugs.webkit.org/show_bug.cgi?id=67183
+
+        Reviewed by Kent Tamura.
+
+        Two test cases now pass.
+
+        * fast/forms/textfield-lastchange-was-useredit-expected.txt:
+
 2011-08-29  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/LayoutTests/fast/forms/textfield-lastchange-was-useredit-expected.txt

@@ -20 +20 @@
 PASS document.execCommand("SelectAll", false, null); internals.wasLastChangeUserEdit(textField) is false
 PASS document.execCommand("Delete", false, null); internals.wasLastChangeUserEdit(textField) is true
-FAIL textField.textContent = "hello\nworld"; internals.wasLastChangeUserEdit(textField) should be false. Was true.
+PASS textField.textContent = "hello\nworld"; internals.wasLastChangeUserEdit(textField) is false
 PASS document.execCommand("InsertText", false, "\nWebKit rocks"); internals.wasLastChangeUserEdit(textField) is true
-FAIL textField.innerText = " WebKit "; internals.wasLastChangeUserEdit(textField) should be false. Was true.
+PASS textField.innerText = " WebKit "; internals.wasLastChangeUserEdit(textField) is false
 PASS successfullyParsed is true
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-30  Ryosuke Niwa  <rniwa@webkit.org>
+
+        lastChangeWasUserEdit continues to return true when innerText or textContent is modified
+        https://bugs.webkit.org/show_bug.cgi?id=67183
+
+        Reviewed by Kent Tamura.
+
+        Fixed the bug by calling setLastChangeWasNotUserEdit in HTMLTextAreaElement::childrenChanged.
+
+        Also got rid of HTMLTextFormControlElement::subtreeHasChanged because it was a needless indirection.
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::subtreeHasChanged): No longer calls HTMLTextFormControlElement::subtreeHasChanged.
+        * html/HTMLTextAreaElement.cpp:
+        (WebCore::HTMLTextAreaElement::childrenChanged): Calls setLastChangeWasNotUserEdit.
+        (WebCore::HTMLTextAreaElement::subtreeHasChanged): No longer calls HTMLTextFormControlElement::subtreeHasChanged.
+        * html/HTMLTextFormControlElement.cpp:
+        (WebCore::HTMLTextFormControlElement::defaultEventHandler): Merged subtreeHasChanged.
+        (WebCore::HTMLTextFormControlElement::setInnerTextValue): No longer set m_lastChangeWasUserEdit to false
+        since this is now done when renderers are set dirty.
+        * html/HTMLTextFormControlElement.h: Made subtreeHasChanged a pure virtual function.
+
 2011-08-29  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -616 +616 @@
     ASSERT(renderer());
     RenderTextControlSingleLine* renderTextControl = toRenderTextControlSingleLine(renderer());
-
-    HTMLTextFormControlElement::subtreeHasChanged();
 
     bool wasChanged = wasChangedSinceLastFormControlChangeEvent();

trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

@@ -99 +99 @@
 void HTMLTextAreaElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
 {
+    setLastChangeWasNotUserEdit();
     if (!m_isDirty)
         setNonDirtyValue(defaultValue());
@@ -231 +232 @@
 void HTMLTextAreaElement::subtreeHasChanged()
 {
-    HTMLTextFormControlElement::subtreeHasChanged();
-
     setChangedSinceLastFormControlChangeEvent(true);
     setFormControlValueMatchesRenderer(false);

trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp

@@ -90 +90 @@
 {
     if (event->type() == eventNames().webkitEditableContentChangedEvent && renderer() && renderer()->isTextControl()) {
+        m_lastChangeWasUserEdit = true;
         subtreeHasChanged();
         return;
@@ -102 +103 @@
         return;
     innerTextElement()->defaultEventHandler(event);
-}
-
-void HTMLTextFormControlElement::subtreeHasChanged()
-{
-    m_lastChangeWasUserEdit = true;
 }
 
@@ -476 +472 @@
             ASSERT(!ec);
         }
-
-        // We set m_lastChangeWasUserEdit to false since this change was not explicitly made by the user (say, via typing on the keyboard), see <rdar://problem/5359921>.
-        m_lastChangeWasUserEdit = false;
     }
 

trunk/Source/WebCore/html/HTMLTextFormControlElement.h

@@ -98 +98 @@
 
     virtual void defaultEventHandler(Event*);
-    virtual void subtreeHasChanged();
+    virtual void subtreeHasChanged() = 0;
 
     void setLastChangeWasNotUserEdit() { m_lastChangeWasUserEdit = false; }