fast/forms/search-event-delay.html is asserting in markAllMisspellingsAndBadGrammarIn...
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Sep 2012 22:43:35 +0000 (22:43 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Sep 2012 22:43:35 +0000 (22:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=82761

Reviewed by Ryosuke Niwa.

Speculative fix for this assertion: have InternalSettings save
and restore the value of the "unifiedTextCheckerEnabled" setting
between tests, so that tests change the value of this setting don't
affect later tests.

* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
* testing/InternalSettings.h:
(Backup):

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

Source/WebCore/ChangeLog
Source/WebCore/testing/InternalSettings.cpp
Source/WebCore/testing/InternalSettings.h

index 87813c0..4c91bac 100644 (file)
@@ -1,3 +1,21 @@
+2012-09-18  Simon Fraser  <simon.fraser@apple.com>
+
+        fast/forms/search-event-delay.html is asserting in markAllMisspellingsAndBadGrammarInRanges()
+        https://bugs.webkit.org/show_bug.cgi?id=82761
+
+        Reviewed by Ryosuke Niwa.
+
+        Speculative fix for this assertion: have InternalSettings save
+        and restore the value of the "unifiedTextCheckerEnabled" setting
+        between tests, so that tests change the value of this setting don't
+        affect later tests.
+
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::Backup::Backup):
+        (WebCore::InternalSettings::Backup::restoreTo):
+        * testing/InternalSettings.h:
+        (Backup):
+
 2012-09-18  John Mellor  <johnme@chromium.org>
 
         Text Autosizing: Ignore constrained heights in certain circumstances.
index b95bbc3..1a4c15a 100755 (executable)
@@ -80,6 +80,7 @@ InternalSettings::Backup::Backup(Page* page, Settings* settings)
     , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::authorShadowDOMForAnyElementEnabled())
 #endif
     , m_originalEditingBehavior(settings->editingBehaviorType())
+    , m_originalUnifiedSpellCheckerEnabled(settings->unifiedTextCheckerEnabled())
     , m_originalFixedPositionCreatesStackingContext(settings->fixedPositionCreatesStackingContext())
     , m_originalSyncXHRInDocumentsEnabled(settings->syncXHRInDocumentsEnabled())
 #if ENABLE(INSPECTOR) && ENABLE(JAVASCRIPT_DEBUGGER)
@@ -113,6 +114,7 @@ void InternalSettings::Backup::restoreTo(Page* page, Settings* settings)
     RuntimeEnabledFeatures::setAuthorShadowDOMForAnyElementEnabled(m_originalAuthorShadowDOMForAnyElementEnabled);
 #endif
     settings->setEditingBehaviorType(m_originalEditingBehavior);
+    settings->setUnifiedTextCheckerEnabled(m_originalUnifiedSpellCheckerEnabled);
     settings->setFixedPositionCreatesStackingContext(m_originalFixedPositionCreatesStackingContext);
     settings->setSyncXHRInDocumentsEnabled(m_originalSyncXHRInDocumentsEnabled);
 #if ENABLE(INSPECTOR) && ENABLE(JAVASCRIPT_DEBUGGER)
index f5aad8e..744e5ab 100755 (executable)
@@ -62,6 +62,7 @@ public:
         bool m_originalAuthorShadowDOMForAnyElementEnabled;
 #endif
         EditingBehaviorType m_originalEditingBehavior;
+        bool m_originalUnifiedSpellCheckerEnabled;
         bool m_originalFixedPositionCreatesStackingContext;
         bool m_originalSyncXHRInDocumentsEnabled;
 #if ENABLE(INSPECTOR) && ENABLE(JAVASCRIPT_DEBUGGER)