REGRESSION(r150393): editing/inserting/typing-at-end-of-line.html fails

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

Reviewed by Antti Koivisto.

The bug was caused by DRT not resetting various auto correction states.
Do that in Internals::resetToConsistentState.

* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 425d8a3d0f00daf61b5516b18a7a664221651d12..12c8f2ba3198a6ca70088a832738fc78bc118bbc 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2013-05-21  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r150393): editing/inserting/typing-at-end-of-line.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=116516
+
+        Reviewed by Antti Koivisto.
+
+        The bug was caused by DRT not resetting various auto correction states.
+        Do that in Internals::resetToConsistentState.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::resetToConsistentState):
+
 2013-05-20  Zan Dobersek  <zdobersek@igalia.com>
 
         [GTK] Fix concatenations of string literals that are not C++11-compliant

diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
index a6254c4fb16c9fd986a5d4885a47d1a360191386..0410c681a10b734536a6487856989e7750026508 100644 (file)
--- a/Source/WebCore/testing/Internals.cpp
+++ b/Source/WebCore/testing/Internals.cpp
@@ -285,6 +285,20 @@ void Internals::resetToConsistentState(Page* page)
 #endif
     if (!page->mainFrame()->editor().isContinuousSpellCheckingEnabled())
         page->mainFrame()->editor().toggleContinuousSpellChecking();
+
+#if USE(AUTOMATIC_TEXT_REPLACEMENT)
+    if (page->mainFrame()->editor().isAutomaticQuoteSubstitutionEnabled())
+        page->mainFrame()->editor().toggleAutomaticQuoteSubstitution();
+    if (page->mainFrame()->editor().isAutomaticLinkDetectionEnabled())
+        page->mainFrame()->editor().toggleAutomaticLinkDetection();
+    if (page->mainFrame()->editor().isAutomaticDashSubstitutionEnabled())
+        page->mainFrame()->editor().toggleAutomaticDashSubstitution();
+    if (page->mainFrame()->editor().isAutomaticTextReplacementEnabled())
+        page->mainFrame()->editor().toggleAutomaticTextReplacement();
+    if (!page->mainFrame()->editor().isAutomaticSpellingCorrectionEnabled())
+        page->mainFrame()->editor().toggleAutomaticSpellingCorrection();
+#endif
+
     if (page->mainFrame()->editor().isOverwriteModeEnabled())
         page->mainFrame()->editor().toggleOverwriteModeEnabled();
 }