Changeset 148306 in webkit

Timestamp:

Apr 12, 2013 3:46:01 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

[Mac] REGRESSION: Auto substitution strips new lines
​https://bugs.webkit.org/show_bug.cgi?id=114537

Reviewed by Enrica Casucci.

Source/WebCore:

The bug was caused by SpellingCorrectionCommand's use of InsertTextCommand. This command can't insert
new lines and there's even an assertion for it. Use TypingCommand::insertText instead.

Since TypingCommand::insertText calls appliedEditing on its own, we need to avoid calling that again in
CompositeEditCommand::apply after SpellingCorrectionCommand::doApply. Replaced the check in apply to use
callsAppliedEditingInDoApply instead of isTypingCommand, and added callsAppliedEditingInDoApply to both
TypingCommand and SpellingCorrectionCommand to return true (it returns false by default).

Test: platform/mac/editing/spelling/autocorrection-with-multi-line-text.html

• editing/CompositeEditCommand.cpp:

(WebCore::CompositeEditCommand::apply): Use TypingCommand::insertText instead of InsertTextCommand
(WebCore::CompositeEditCommand::callsAppliedEditingInDoApply): Added. Returns false.

• editing/CompositeEditCommand.h:

(CompositeEditCommand):

• editing/SpellingCorrectionCommand.cpp:

(WebCore::SpellingCorrectionCommand::doApply):
(WebCore::SpellingCorrectionCommand::callsAppliedEditingInDoApply): Added. Returns true.

• editing/SpellingCorrectionCommand.h:

(SpellingCorrectionCommand):

• editing/TypingCommand.cpp:

(WebCore::TypingCommand::callsAppliedEditingInDoApply): Added. Returns true.

• editing/TypingCommand.h:

(TypingCommand):

Tools:

Add a rule to replace "helloleworld" by "hello\nworld" for testing purpose.

• DumpRenderTree/mac/DumpRenderTree.mm:

(resetDefaultsToConsistentValues):

LayoutTests:

Added a regression test. Unfortunately, we can't setup text substituion in DumpRenderTree
so use NSSpellChecker to exercise the relevant code path.

• platform/mac/editing/spelling/autocorrection-with-multi-line-text-expected.txt: Added.
• platform/mac/editing/spelling/autocorrection-with-multi-line-text.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/editing/spelling/autocorrection-with-multi-line-text-expected.txt (added)
• LayoutTests/platform/mac/editing/spelling/autocorrection-with-multi-line-text.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/CompositeEditCommand.cpp (modified) (2 diffs)
• Source/WebCore/editing/CompositeEditCommand.h (modified) (1 diff)
• Source/WebCore/editing/SpellingCorrectionCommand.cpp (modified) (3 diffs)
• Source/WebCore/editing/SpellingCorrectionCommand.h (modified) (1 diff)
• Source/WebCore/editing/TypingCommand.cpp (modified) (1 diff)
• Source/WebCore/editing/TypingCommand.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        [Mac] REGRESSION: Auto substitution strips new lines
+        https://bugs.webkit.org/show_bug.cgi?id=114537
+
+        Reviewed by Enrica Casucci.
+
+        Added a regression test. Unfortunately, we can't setup text substituion in DumpRenderTree
+        so use NSSpellChecker to exercise the relevant code path.
+
+        * platform/mac/editing/spelling/autocorrection-with-multi-line-text-expected.txt: Added.
+        * platform/mac/editing/spelling/autocorrection-with-multi-line-text.html: Added.
+
 2013-04-12  Commit Queue  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        [Mac] REGRESSION: Auto substitution strips new lines
+        https://bugs.webkit.org/show_bug.cgi?id=114537
+
+        Reviewed by Enrica Casucci.
+
+        The bug was caused by SpellingCorrectionCommand's use of InsertTextCommand. This command can't insert
+        new lines and there's even an assertion for it. Use TypingCommand::insertText instead.
+
+        Since TypingCommand::insertText calls appliedEditing on its own, we need to avoid calling that again in
+        CompositeEditCommand::apply after SpellingCorrectionCommand::doApply. Replaced the check in apply to use
+        callsAppliedEditingInDoApply instead of isTypingCommand, and added callsAppliedEditingInDoApply to both
+        TypingCommand and SpellingCorrectionCommand to return true (it returns false by default).
+
+        Test: platform/mac/editing/spelling/autocorrection-with-multi-line-text.html
+
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::apply): Use TypingCommand::insertText instead of InsertTextCommand
+        (WebCore::CompositeEditCommand::callsAppliedEditingInDoApply): Added. Returns false.
+        * editing/CompositeEditCommand.h:
+        (CompositeEditCommand):
+        * editing/SpellingCorrectionCommand.cpp:
+        (WebCore::SpellingCorrectionCommand::doApply):
+        (WebCore::SpellingCorrectionCommand::callsAppliedEditingInDoApply): Added. Returns true.
+        * editing/SpellingCorrectionCommand.h:
+        (SpellingCorrectionCommand):
+        * editing/TypingCommand.cpp:
+        (WebCore::TypingCommand::callsAppliedEditingInDoApply): Added. Returns true.
+        * editing/TypingCommand.h:
+        (TypingCommand):
+
 2013-04-12  Brendan Long  <b.long@cablelabs.com>
 

trunk/Source/WebCore/editing/CompositeEditCommand.cpp

@@ -217 +217 @@
     // Only need to call appliedEditing for top-level commands,
     // and TypingCommands do it on their own (see TypingCommand::typingAddedToOpenCommand).
-    if (!isTypingCommand())
+    if (!callsAppliedEditingInDoApply())
         frame->editor()->appliedEditing(this);
     setShouldRetainAutocorrectionIndicator(false);
@@ -243 +243 @@
 
 bool CompositeEditCommand::isTypingCommand() const
+{
+    return false;
+}
+
+bool CompositeEditCommand::callsAppliedEditingInDoApply() const
 {
     return false;

trunk/Source/WebCore/editing/CompositeEditCommand.h

@@ -83 +83 @@
     virtual bool isCreateLinkCommand() const;
     virtual bool isTypingCommand() const;
+    virtual bool callsAppliedEditingInDoApply() const;
     virtual bool isDictationCommand() const { return false; }
     virtual bool preservesTypingStyle() const;

trunk/Source/WebCore/editing/SpellingCorrectionCommand.cpp

@@ -31 +31 @@
 #include "DocumentFragment.h"
 #include "Frame.h"
-#include "InsertTextCommand.h"
 #include "SetSelectionCommand.h"
 #include "TextIterator.h"
+#include "TypingCommand.h"
 #include "markup.h"
 
@@ -102 +102 @@
     applyCommandToComposite(SpellingCorrectionRecordUndoCommand::create(document(), m_corrected, m_correction));
 #endif
-    applyCommandToComposite(InsertTextCommand::create(document(), m_correction));
+    TypingCommand::insertText(document(), m_correction, TypingCommand::PreventSpellChecking);
 }
 
@@ -110 +110 @@
 }
 
+bool SpellingCorrectionCommand::callsAppliedEditingInDoApply() const
+{
+    return true;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/editing/SpellingCorrectionCommand.h

@@ -42 +42 @@
     virtual void doApply();
     virtual bool shouldRetainAutocorrectionIndicator() const;
+    virtual bool callsAppliedEditingInDoApply() const;
 
     RefPtr<Range> m_rangeToBeCorrected;

trunk/Source/WebCore/editing/TypingCommand.cpp

@@ -646 +646 @@
 }
 
+bool TypingCommand::callsAppliedEditingInDoApply() const
+{
+    return true;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/editing/TypingCommand.h

@@ -101 +101 @@
     virtual EditAction editingAction() const;
     virtual bool isTypingCommand() const;
+    virtual bool callsAppliedEditingInDoApply() const;
     virtual bool preservesTypingStyle() const { return m_preservesTypingStyle; }
     virtual bool shouldRetainAutocorrectionIndicator() const

trunk/Tools/ChangeLog

@@ +1 @@
+2013-04-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        [Mac] REGRESSION: Auto substitution strips new lines
+        https://bugs.webkit.org/show_bug.cgi?id=114537
+
+        Reviewed by Enrica Casucci.
+
+        Add a rule to replace "helloleworld" by "hello\nworld" for testing purpose.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetDefaultsToConsistentValues):
+
 2013-04-09  Roger Fong  <roger_fong@apple.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -607 +607 @@
         @"would", @"wouldn",
         @"welcome", @"wellcome",
-        @"uppercase", @"upper case",
+        @"hello\nworld", @"hellolfworld",
         nil] forKey:@"NSTestCorrectionDictionary"];
 #endif