Changeset 96628 in webkit

Timestamp:

Oct 4, 2011 12:02:44 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION(r94274): setting input.value erroneously triggers focus event
​https://bugs.webkit.org/show_bug.cgi?id=69315

Reviewed by Kent Tamura.

Fixed the bug by adding a new flag to setSelection to avoid calling setFocusedNodeIfNeeded
when called by nodeWillBeRemoved and textWillBeReplaced.

Added a manual test. Unfortunately, the test always passes in DRT.

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::setSelection):
(WebCore::FrameSelection::respondToNodeModification):
(WebCore::FrameSelection::textWillBeReplaced):

• editing/FrameSelection.h:
• manual-tests/mutate-unfocused-text-with-selection.html: Added.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/FrameSelection.cpp (modified) (3 diffs)
• editing/FrameSelection.h (modified) (1 diff)
• manual-tests/mutate-unfocused-text-with-selection.html (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-04  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r94274): setting input.value erroneously triggers focus event
+        https://bugs.webkit.org/show_bug.cgi?id=69315
+
+        Reviewed by Kent Tamura.
+
+        Fixed the bug by adding a new flag to setSelection to avoid calling setFocusedNodeIfNeeded
+        when called by nodeWillBeRemoved and textWillBeReplaced.
+
+        Added a manual test. Unfortunately, the test always passes in DRT.
+
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::setSelection):
+        (WebCore::FrameSelection::respondToNodeModification):
+        (WebCore::FrameSelection::textWillBeReplaced):
+        * editing/FrameSelection.h:
+        * manual-tests/mutate-unfocused-text-with-selection.html: Added.
+
 2011-10-04  Young Han Lee  <joybro201@gmail.com>
 

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -275 +275 @@
     setCaretRectNeedsUpdate();
     
-    if (!s.isNone())
+    if (!s.isNone() && !(options & DoNotSetFocus))
         setFocusedNodeIfNeeded();
     
@@ -394 +394 @@
 
     if (clearDOMTreeSelection)
-        setSelection(VisibleSelection(), 0);
+        setSelection(VisibleSelection(), DoNotSetFocus);
 }
 
@@ -434 +434 @@
         newSelection.setWithoutValidation(base, extent);
         m_frame->document()->updateLayout();
-        setSelection(newSelection, 0);
+        setSelection(newSelection, DoNotSetFocus);
     }
 }

trunk/Source/WebCore/editing/FrameSelection.h

@@ -116 +116 @@
         ClearTypingStyle = 1 << 2,
         SpellCorrectionTriggered = 1 << 3,
+        DoNotSetFocus = 1 << 4,
     };
     typedef unsigned SetSelectionOptions; // Union of values in SetSelectionOption and EUserTriggered