Title: [128941] trunk/Source/WebCore
Revision
128941
Author
[email protected]
Date
2012-09-18 15:43:35 -0700 (Tue, 18 Sep 2012)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (128940 => 128941)


--- trunk/Source/WebCore/ChangeLog	2012-09-18 22:38:27 UTC (rev 128940)
+++ trunk/Source/WebCore/ChangeLog	2012-09-18 22:43:35 UTC (rev 128941)
@@ -1,3 +1,21 @@
+2012-09-18  Simon Fraser  <[email protected]>
+
+        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  <[email protected]>
 
         Text Autosizing: Ignore constrained heights in certain circumstances.

Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (128940 => 128941)


--- trunk/Source/WebCore/testing/InternalSettings.cpp	2012-09-18 22:38:27 UTC (rev 128940)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp	2012-09-18 22:43:35 UTC (rev 128941)
@@ -80,6 +80,7 @@
     , 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 @@
     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)

Modified: trunk/Source/WebCore/testing/InternalSettings.h (128940 => 128941)


--- trunk/Source/WebCore/testing/InternalSettings.h	2012-09-18 22:38:27 UTC (rev 128940)
+++ trunk/Source/WebCore/testing/InternalSettings.h	2012-09-18 22:43:35 UTC (rev 128941)
@@ -62,6 +62,7 @@
         bool m_originalAuthorShadowDOMForAnyElementEnabled;
 #endif
         EditingBehaviorType m_originalEditingBehavior;
+        bool m_originalUnifiedSpellCheckerEnabled;
         bool m_originalFixedPositionCreatesStackingContext;
         bool m_originalSyncXHRInDocumentsEnabled;
 #if ENABLE(INSPECTOR) && ENABLE(_javascript__DEBUGGER)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to