Attachment 193356 Details for Bug 112362 – Patch for landing

[patch] Patch for landing

bug-112362-20130315125618.patch (text/plain), 32.68 KB, created by Rouslan Solomakhin on 2013-03-15 13:00:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rouslan Solomakhin

Created: 2013-03-15 13:00:23 PDT

Size: 32.68 KB

patch

obsolete

>Subversion Revision: 145906
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 12b36cc6f94889ea3ee9c2397347867cbf85ca1a..20fd5d2efb085642f5fd260c132826fe24b240fa 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2013-03-14  Rouslan Solomakhin  <rouslan@chromium.org>
>+
>+        Remove unused unified textchecker variable
>+        https://bugs.webkit.org/show_bug.cgi?id=112362
>+
>+        Reviewed by Tony Chang.
>+
>+        The variable m_originalUnifiedSpellCheckerEnabled is never used. The generated
>+        code from Settings.in already backs up and restores unified textchecker setting.
>+
>+        * testing/InternalSettings.h: Remove unusued m_originalUnifiedSpellCheckerEnabled variable.
>+
> 2013-03-15  Marja HÃ¶lttÃ¤  <marja@chromium.org>
> 
>         [V8] Store main world and non-main world templates separately.
>diff --git a/Source/WebCore/testing/InternalSettings.h b/Source/WebCore/testing/InternalSettings.h
>index 549b0fa45fa40b26dc848a52a25aa78a173a2c48..18742e24ab9f330859f3c76139a97d7fe3b1e727 100644
>--- a/Source/WebCore/testing/InternalSettings.h
>+++ b/Source/WebCore/testing/InternalSettings.h
>@@ -60,7 +60,6 @@ public:
>         bool m_originalStyleScoped;
> #endif
>         EditingBehaviorType m_originalEditingBehavior;
>-        bool m_originalUnifiedSpellCheckerEnabled;
> #if ENABLE(TEXT_AUTOSIZING)
>         bool m_originalTextAutosizingEnabled;
>         IntSize m_originalTextAutosizingWindowSizeOverride;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e612b497ceb66e7e811ac6c5c7982f5fdeb255e8..6b4067f1e6bcf6c1e8c136087f49eeeb980e29da 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,26 @@
>+2013-03-14  Rouslan Solomakhin  <rouslan@chromium.org>
>+
>+        Remove setAsynchronousSpellCheckingEnabled from test runners
>+        https://bugs.webkit.org/show_bug.cgi?id=112362
>+
>+        Reviewed by Tony Chang.
>+
>+        Remove setAsynchronousSpellCheckingEnabled from test runners. The setting is now
>+        in internals.settings, so all ports can share it.
>+
>+        * DumpRenderTree/TestRunner.cpp: Remove setAsynchronousSpellCheckingEnabled() method.
>+        * DumpRenderTree/TestRunner.h: Remove setAsynchronousSpellCheckingEnabled() method.
>+        * DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp: Remove setAsynchronousSpellCheckingEnabled() method.
>+        * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp: Remove setAsynchronousSpellCheckingEnabled() method.
>+        * DumpRenderTree/chromium/TestRunner/src/TestRunner.h: Remove setAsynchronousSpellCheckingEnabled() method.
>+        * DumpRenderTree/efl/TestRunnerEfl.cpp: Remove setAsynchronousSpellCheckingEnabled() method.
>+        * DumpRenderTree/gtk/TestRunnerGtk.cpp: Remove setAsynchronousSpellCheckingEnabled() method.
>+        * DumpRenderTree/mac/TestRunnerMac.mm: Remove setAsynchronousSpellCheckingEnabled() method.
>+        * DumpRenderTree/qt/TestRunnerQt.cpp: Remove setAsynchronousSpellCheckingEnabled() method.
>+        * DumpRenderTree/qt/TestRunnerQt.h: Remove setAsynchronousSpellCheckingEnabled() method.
>+        * DumpRenderTree/win/TestRunnerWin.cpp: Remove setAsynchronousSpellCheckingEnabled() method.
>+        * DumpRenderTree/wx/TestRunnerWx.cpp: Remove setAsynchronousSpellCheckingEnabled() method.
>+
> 2013-03-15  Zeno Albisser  <zeno@webkit.org>
> 
>         [Qt] Remove simple getters and setters from TestRunnerQt
>diff --git a/Tools/DumpRenderTree/TestRunner.cpp b/Tools/DumpRenderTree/TestRunner.cpp
>index daeccafe6dde5aecaf3e4a4cf06bd62f7be38465..7684ad1c36999ac726e0699a47c689611afd050c 100644
>--- a/Tools/DumpRenderTree/TestRunner.cpp
>+++ b/Tools/DumpRenderTree/TestRunner.cpp
>@@ -1523,16 +1523,6 @@ static JSValueRef setStopProvisionalFrameLoadsCallback(JSContextRef context, JSO
>     return JSValueMakeUndefined(context);
> }
> 
>-static JSValueRef setAsynchronousSpellCheckingEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
>-{
>-    if (argumentCount < 1)
>-        return JSValueMakeUndefined(context);
>-
>-    TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
>-    controller->setAsynchronousSpellCheckingEnabled(JSValueToBoolean(context, arguments[0]));
>-    return JSValueMakeUndefined(context);
>-}
>-
> static JSValueRef showWebInspectorCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
> {
>     TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
>@@ -2134,7 +2124,6 @@ JSStaticFunction* TestRunner::staticFunctions()
>         { "setWindowIsKey", setWindowIsKeyCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "setJavaScriptCanAccessClipboard", setJavaScriptCanAccessClipboardCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "setXSSAuditorEnabled", setXSSAuditorEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>-        { "setAsynchronousSpellCheckingEnabled", setAsynchronousSpellCheckingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "showWebInspector", showWebInspectorCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "simulateLegacyWebNotificationClick", simulateLegacyWebNotificationClickCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>         { "testOnscreen", testOnscreenCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
>diff --git a/Tools/DumpRenderTree/TestRunner.h b/Tools/DumpRenderTree/TestRunner.h
>index 17fb408db9f8840025f6ab91747bca8e74b39afd..f23ab120d7cb581b3d5dd045e393be9938275596 100644
>--- a/Tools/DumpRenderTree/TestRunner.h
>+++ b/Tools/DumpRenderTree/TestRunner.h
>@@ -289,7 +289,6 @@ public:
>     bool geolocationPermission() const { return m_geolocationPermission; }
> 
>     void setDeveloperExtrasEnabled(bool);
>-    void setAsynchronousSpellCheckingEnabled(bool);
>     void showWebInspector();
>     void closeWebInspector();
>     void evaluateInWebInspector(long callId, JSStringRef script);
>diff --git a/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp b/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp
>index bd2f0345758f03afa19625a43442b64fd4682d50..0b2d58f17b90447843a7a8c1cd5f07b2f765bf7c 100644
>--- a/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp
>+++ b/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp
>@@ -572,11 +572,6 @@ void TestRunner::deleteAllLocalStorage()
>     notImplemented();
> }
> 
>-void TestRunner::setAsynchronousSpellCheckingEnabled(bool)
>-{
>-    notImplemented();
>-}
>-
> int TestRunner::numberOfPendingGeolocationPermissionRequests()
> {
>     return DumpRenderTreeSupport::numberOfPendingGeolocationPermissionRequests(BlackBerry::WebKit::DumpRenderTree::currentInstance()->page());
>diff --git a/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp b/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
>index 40fb456baff6a3aa578a67b4eb6d68e317fa1fa5..56fffd75351073826d748cacf1a9d31d6ce3f166 100644
>--- a/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
>+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
>@@ -225,7 +225,6 @@ TestRunner::TestRunner(TestInterfaces* interfaces)
>     bindMethod("setAllowFileAccessFromFileURLs", &TestRunner::setAllowFileAccessFromFileURLs);
>     bindMethod("overridePreference", &TestRunner::overridePreference);
>     bindMethod("setPluginsEnabled", &TestRunner::setPluginsEnabled);
>-    bindMethod("setAsynchronousSpellCheckingEnabled", &TestRunner::setAsynchronousSpellCheckingEnabled);
>     bindMethod("setTouchDragDropEnabled", &TestRunner::setTouchDragDropEnabled);
> 
>     // The following modify the state of the TestRunner.
>@@ -1654,15 +1653,6 @@ void TestRunner::setPluginsEnabled(const CppArgumentList& arguments, CppVariant*
>     result->setNull();
> }
> 
>-void TestRunner::setAsynchronousSpellCheckingEnabled(const CppArgumentList& arguments, CppVariant* result)
>-{
>-    if (arguments.size() > 0 && arguments[0].isBool()) {
>-        m_delegate->preferences()->asynchronousSpellCheckingEnabled = cppVariantToBool(arguments[0]);
>-        m_delegate->applyPreferences();
>-    }
>-    result->setNull();
>-}
>-
> void TestRunner::setTouchDragDropEnabled(const CppArgumentList& arguments, CppVariant* result)
> {
>     if (arguments.size() > 0 && arguments[0].isBool()) {
>diff --git a/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h b/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h
>index 1b0c6d491ddb52fc881460ad9999793289d8fdc2..02291f9b2bf5d8b95f05f6e92a8a7b84f16107ae 100644
>--- a/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h
>+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h
>@@ -302,9 +302,6 @@ private:
>     // Enable or disable plugins.
>     void setPluginsEnabled(const CppArgumentList&, CppVariant*);
> 
>-    // Changes asynchronous spellchecking flag on the settings.
>-    void setAsynchronousSpellCheckingEnabled(const CppArgumentList&, CppVariant*);
>-
>     void setTouchDragDropEnabled(const CppArgumentList&, CppVariant*);
> 
>     ///////////////////////////////////////////////////////////////////////////
>diff --git a/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp b/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp
>index a99a3b5edc7687b42f42128895da8da7f35c1e7a..a43ae067c726c27e183671b25a7355fdb3f2f029 100644
>--- a/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp
>+++ b/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp
>@@ -679,11 +679,6 @@ void TestRunner::setDeveloperExtrasEnabled(bool enabled)
>     ewk_view_setting_enable_developer_extras_set(browser->mainView(), enabled);
> }
> 
>-void TestRunner::setAsynchronousSpellCheckingEnabled(bool)
>-{
>-    notImplemented();
>-}
>-
> void TestRunner::showWebInspector()
> {
>     ewk_view_inspector_show(browser->mainView());
>diff --git a/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp b/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp
>index cd1044d0d2331e2a4a1ec77e8d42f9727faada66..bff0115af1bb157d3bc05e28fa55fdd8c91acafb 100644
>--- a/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp
>+++ b/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp
>@@ -779,11 +779,6 @@ void TestRunner::setDeveloperExtrasEnabled(bool enabled)
>     g_object_set(webSettings, "enable-developer-extras", enabled, NULL);
> }
> 
>-void TestRunner::setAsynchronousSpellCheckingEnabled(bool)
>-{
>-    // FIXME: Implement this.
>-}
>-
> void TestRunner::showWebInspector()
> {
>     WebKitWebView* webView = webkit_web_frame_get_web_view(mainFrame);
>diff --git a/Tools/DumpRenderTree/mac/TestRunnerMac.mm b/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>index b31c9ad727b2e66f7fe7b5ca1d68dbb4e47bfe69..f410c755d22a391d2c6a959028bbbe9441f05ea2 100644
>--- a/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>+++ b/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>@@ -782,11 +782,6 @@ void TestRunner::setDeveloperExtrasEnabled(bool enabled)
>     [[[mainFrame webView] preferences] setDeveloperExtrasEnabled:enabled];
> }
> 
>-void TestRunner::setAsynchronousSpellCheckingEnabled(bool enabled)
>-{
>-    [[[mainFrame webView] preferences] setAsynchronousSpellCheckingEnabled:enabled];
>-}
>-
> void TestRunner::showWebInspector()
> {
>     [[[mainFrame webView] inspector] show:nil];
>diff --git a/Tools/DumpRenderTree/qt/TestRunnerQt.cpp b/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
>index 18d0d7ac51cee97bebbf8a905807c3d8e3c90f08..1ddf9c51c409862edc4001c3ef6ba8f1e9bc2ec8 100644
>--- a/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
>+++ b/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
>@@ -421,11 +421,6 @@ void TestRunnerQt::setDeveloperExtrasEnabled(bool enabled)
>     m_drt->webPage()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, enabled);
> }
> 
>-void TestRunnerQt::setAsynchronousSpellCheckingEnabled(bool)
>-{
>-    // FIXME: Implement this.
>-}
>-
> void TestRunnerQt::showWebInspector()
> {
>     m_drt->webPage()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
>@@ -1168,10 +1163,6 @@ void TestRunner::setStorageDatabaseIdleInterval(double)
> {
> }
> 
>-void TestRunner::setAsynchronousSpellCheckingEnabled(bool)
>-{
>-}
>-
> void TestRunner::setXSSAuditorEnabled(bool flag)
> {
> }
>diff --git a/Tools/DumpRenderTree/qt/TestRunnerQt.h b/Tools/DumpRenderTree/qt/TestRunnerQt.h
>index 4e3cd99d854ac23993b84967f0b8d0400262b1a6..96a61115a5f59b7ff6fa1e10f2d9991e96e1fa44 100644
>--- a/Tools/DumpRenderTree/qt/TestRunnerQt.h
>+++ b/Tools/DumpRenderTree/qt/TestRunnerQt.h
>@@ -128,7 +128,6 @@ public Q_SLOTS:
>     QString decodeHostName(const QString& host);
>     void dumpSelectionRect() const { }
>     void setDeveloperExtrasEnabled(bool);
>-    void setAsynchronousSpellCheckingEnabled(bool);
>     void showWebInspector();
>     void closeWebInspector();
>     void evaluateInWebInspector(long callId, const QString& script);
>diff --git a/Tools/DumpRenderTree/win/TestRunnerWin.cpp b/Tools/DumpRenderTree/win/TestRunnerWin.cpp
>index dd4d8731dfee483dfe0e9b87152fa643c6da0c79..d5b9810726d83c58f844de31c563d668056fb70a 100644
>--- a/Tools/DumpRenderTree/win/TestRunnerWin.cpp
>+++ b/Tools/DumpRenderTree/win/TestRunnerWin.cpp
>@@ -952,11 +952,6 @@ void TestRunner::setDeveloperExtrasEnabled(bool enabled)
>     prefsPrivate->setDeveloperExtrasEnabled(enabled);
> }
> 
>-void TestRunner::setAsynchronousSpellCheckingEnabled(bool)
>-{
>-    // FIXME: Implement this.
>-}
>-
> void TestRunner::showWebInspector()
> {
>     COMPtr<IWebView> webView;
>diff --git a/Tools/DumpRenderTree/wx/TestRunnerWx.cpp b/Tools/DumpRenderTree/wx/TestRunnerWx.cpp
>index f4bb94a0e3d296caf7c086c1dfc977bcc66e6994..bb8d71a6f2a41dc74af5056fab6a174c3029cf7e 100644
>--- a/Tools/DumpRenderTree/wx/TestRunnerWx.cpp
>+++ b/Tools/DumpRenderTree/wx/TestRunnerWx.cpp
>@@ -450,11 +450,6 @@ void TestRunner::abortModal()
> {
> }
> 
>-void TestRunner::setAsynchronousSpellCheckingEnabled(bool)
>-{
>-    // FIXME: Implement this.
>-}
>-
> bool TestRunner::findString(JSContextRef context, JSStringRef target, JSObjectRef optionsArray)
> {
>     // FIXME: Implement
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 354bb391dda35833c54307daca29d03c77a4bf95..d06d23b4e805e87b6f97c8a28436a3586d3df720 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,31 @@
>+2013-03-14  Rouslan Solomakhin  <rouslan@chromium.org>
>+
>+        Move setAsynchronousSpellCheckingEnabled to internals.settings
>+        https://bugs.webkit.org/show_bug.cgi?id=112362
>+
>+        Reviewed by Tony Chang.
>+
>+        Changed the tests from using testRunner.setAsynchronousSpellCheckingEnabled(bool)
>+        with port-specific implementations to use internals.settings.setAsynchronousSpellCheckingEnabled(bool)
>+        with one common implementation, similar to internals.settings.setUnifiedTextCheckerEnabled(bool).
>+        Changed the tests to not reset these settings when they finish, because the test harness resets
>+        the settings automatically.
>+
>+        * editing/spelling/grammar-markers-hidpi.html: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * editing/spelling/grammar-markers.html: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * editing/spelling/grammar-paste.html: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * editing/spelling/resources/util.js: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * editing/spelling/script-tests/spellcheck-paste.js: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * editing/spelling/spellcheck-async-mutation.html: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * editing/spelling/spellcheck-async-remove-frame.html: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * editing/spelling/spellcheck-async.html: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * editing/spelling/spellcheck-paste-disabled.html: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * editing/spelling/spellcheck-queue.html: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * editing/spelling/spellcheck-sequencenum.html: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * editing/spelling/spelling-marker-description.html: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * platform/chromium/editing/spelling/delete-misspelled-word.html: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+        * platform/chromium/editing/spelling/move-cursor-to-misspelled-word.html: Use internals.settings.setAsynchronousSpellCheckingEnabled(bool) instead of testRunner.setAsynchronousSpellCheckingEnabled(bool).
>+
> 2013-03-15  Andrey Kosyakov  <caseq@chromium.org>
> 
>         Unreviewed -- remove test expectations for timeline-receive-response-event and remove
>diff --git a/LayoutTests/editing/spelling/grammar-markers-hidpi.html b/LayoutTests/editing/spelling/grammar-markers-hidpi.html
>index 10119eccdf904cad7053911548e1ac8bba59528a..0846a2f5c91b2a6d0d2750833e30511eb49b9e22 100644
>--- a/LayoutTests/editing/spelling/grammar-markers-hidpi.html
>+++ b/LayoutTests/editing/spelling/grammar-markers-hidpi.html
>@@ -5,10 +5,11 @@
> <div id="source" contenteditable="true" spellcheck="false">You has the right.</div>
> <div id="target" contenteditable="true" spellcheck="true"></div>
> <script>
>+if (window.internals)
>+    internals.settings.setAsynchronousSpellCheckingEnabled(true);
> if (window.testRunner) {
>     testRunner.waitUntilDone();
>     testRunner.dumpAsText(true);
>-    testRunner.setAsynchronousSpellCheckingEnabled(true);
>     testRunner.setBackingScaleFactor(2, function () {
>         trial();
>     });
>@@ -25,10 +26,8 @@ var retry = 10;
> function trial() {
>     var hasMarker = internals.hasGrammarMarker(target, 4, 3);
>     if (hasMarker || --retry == 0) {
>-        if (window.testRunner) {
>-            testRunner.setAsynchronousSpellCheckingEnabled(false);
>+        if (window.testRunner)
>             testRunner.notifyDone();
>-        }
>         return;
>     }
>     window.setTimeout(trial, 10);
>diff --git a/LayoutTests/editing/spelling/grammar-markers.html b/LayoutTests/editing/spelling/grammar-markers.html
>index 2a91888ab76eecb52371a8e1d0a897b3e642b7c3..e082bf681a6663cda25c5fa4338d7424125572d8 100644
>--- a/LayoutTests/editing/spelling/grammar-markers.html
>+++ b/LayoutTests/editing/spelling/grammar-markers.html
>@@ -8,8 +8,9 @@
> if (window.testRunner) {
>     testRunner.waitUntilDone();
>     testRunner.dumpAsText(true);
>-    testRunner.setAsynchronousSpellCheckingEnabled(true);
> }
>+if (window.internals)
>+    internals.settings.setAsynchronousSpellCheckingEnabled(true);
> 
> var source = document.getElementById('source');
> window.getSelection().selectAllChildren(source);
>@@ -22,10 +23,8 @@ var retry = 10;
> function trial() {
>     var hasMarker = internals.hasGrammarMarker(target, 4, 3);
>     if (hasMarker || --retry == 0) {
>-        if (window.testRunner) {
>-            testRunner.setAsynchronousSpellCheckingEnabled(false);
>+        if (window.testRunner)
>             testRunner.notifyDone();
>-        }
>         return;
>     }
>     window.setTimeout(trial, 10);
>diff --git a/LayoutTests/editing/spelling/grammar-paste.html b/LayoutTests/editing/spelling/grammar-paste.html
>index 78ddca7c9101ae1c28b15523eccb86dffea0f5ec..a7c23ad44acb373c25a5a339e7d28699e1f68a0f 100644
>--- a/LayoutTests/editing/spelling/grammar-paste.html
>+++ b/LayoutTests/editing/spelling/grammar-paste.html
>@@ -48,8 +48,6 @@ function done()
>     if (next)
>         return window.setTimeout(next, 0);
>     testRoot.style.display = "none";
>-
>-    testRunner.setAsynchronousSpellCheckingEnabled(false);
>     testRunner.notifyDone();
> }
> 
>@@ -136,9 +134,8 @@ function pasteAndVerify(source, dest, expectedMarked)
>     trial();
> };
> 
>-if (window.testRunner) {
>-    testRunner.setAsynchronousSpellCheckingEnabled(true);
>-}
>+if (window.internals)
>+    internals.settings.setAsynchronousSpellCheckingEnabled(true);
> 
> tests.push(function() { pasteAndVerify(testSourcePlain, testEditable, ["has"]); });
> tests.push(function() { pasteAndVerify(testSourceDecorated, testEditable, ["a"]); }); // Checks only 'a'.
>diff --git a/LayoutTests/editing/spelling/resources/util.js b/LayoutTests/editing/spelling/resources/util.js
>index 094a53b289688d82de4de7367a9c94334f562494..bc15e0eb96960cb65aa6f5efb0b14ad941fb44ad 100644
>--- a/LayoutTests/editing/spelling/resources/util.js
>+++ b/LayoutTests/editing/spelling/resources/util.js
>@@ -20,13 +20,13 @@ function verifySpellTest(nretry)
> 
> function initSpellTest(testElementId, testText, testFunction)
> {
>-    if (!window.internals || !window.testRunner || !window.testRunner.setAsynchronousSpellCheckingEnabled) {
>+    if (!window.internals || !window.testRunner) {
>         log("FAIL Incomplete test environment");
>         return;
>     }
>     testFunctionCallback = testFunction;
>     jsTestIsAsync = true;
>-    testRunner.setAsynchronousSpellCheckingEnabled(true);
>+    internals.settings.setAsynchronousSpellCheckingEnabled(true);
>     internals.settings.setSmartInsertDeleteEnabled(true);
>     internals.settings.setSelectTrailingWhitespaceEnabled(false);
>     internals.settings.setUnifiedTextCheckerEnabled(true);
>diff --git a/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js b/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js
>index f309a878482ba78f13e437bac165cbcfdccdfaaa..5d48ed0f6f58babb9bd7732e3de473e337543045 100644
>--- a/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js
>+++ b/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js
>@@ -39,8 +39,6 @@ function done()
>     if (next)
>         return window.setTimeout(next, 0);
>     testRoot.style.display = "none";
>-
>-    testRunner.setAsynchronousSpellCheckingEnabled(false);
>     testRunner.notifyDone();
> }
> 
>@@ -94,8 +92,8 @@ function pasteAndVerify(source, dest, expectedMarked)
>     trial();
> };
> 
>-if (window.testRunner)
>-    testRunner.setAsynchronousSpellCheckingEnabled(true);
>+if (window.internals)
>+    internals.settings.setAsynchronousSpellCheckingEnabled(true);
> 
> tests.push(function() { pasteAndVerify(testSourcePlain, testInput, [[0, 2]]); });
> tests.push(function() { pasteAndVerify(testSourceDecorated, testInput, [[0, 2]]); });
>diff --git a/LayoutTests/editing/spelling/spellcheck-async-mutation.html b/LayoutTests/editing/spelling/spellcheck-async-mutation.html
>index 4b082e2c53306b2ac7d6bf40d370b79d74596c97..6f2c0d88fa25780c1cdac78e908043f7b2f05e7a 100644
>--- a/LayoutTests/editing/spelling/spellcheck-async-mutation.html
>+++ b/LayoutTests/editing/spelling/spellcheck-async-mutation.html
>@@ -30,13 +30,13 @@ description(
> 
> var jsTestIsAsync = true;
> 
>-if (window.testRunner) {
>+if (window.testRunner)
>     testRunner.dumpAsText();
>-    testRunner.setAsynchronousSpellCheckingEnabled(true);
>-}
> 
>-if (window.internals)
>+if (window.internals) {
>+    internals.settings.setAsynchronousSpellCheckingEnabled(true);
>     internals.settings.setUnifiedTextCheckerEnabled(true);
>+}
> 
> var sourceIds = ['source'];
> var destElems = ['textarea', 'input', 'contenteditable'];
>@@ -76,13 +76,8 @@ function doTestIfAny() {
>     removeAllChildren(document.getElementById('container'));
>     removeAllChildren(document.getElementById('move-target'));
> 
>-    if (window.internals)
>-        internals.settings.setUnifiedTextCheckerEnabled(false);
>-
>-    if (window.testRunner) {
>-        testRunner.setAsynchronousSpellCheckingEnabled(false);
>+    if (window.testRunner)
>         finishJSTest();
>-    }
> }
> 
> var requestId;
>diff --git a/LayoutTests/editing/spelling/spellcheck-async-remove-frame.html b/LayoutTests/editing/spelling/spellcheck-async-remove-frame.html
>index 6df850f3bb1388a1753089049a52ceef4251ba3c..c78f9e082de9a437f16465b816ff03332b345555 100644
>--- a/LayoutTests/editing/spelling/spellcheck-async-remove-frame.html
>+++ b/LayoutTests/editing/spelling/spellcheck-async-remove-frame.html
>@@ -5,7 +5,7 @@
> if (window.testRunner) {
>     testRunner.waitUntilDone();
>     testRunner.dumpAsText();
>-    testRunner.setAsynchronousSpellCheckingEnabled(true);
>+    internals.settings.setAsynchronousSpellCheckingEnabled(true);
>     internals.settings.setUnifiedTextCheckerEnabled(true);
> }
> 
>diff --git a/LayoutTests/editing/spelling/spellcheck-async.html b/LayoutTests/editing/spelling/spellcheck-async.html
>index 02383c80f67b9cdd5bacba53a3f2867d944df634..4087e8f4ed6cfc0cd7fca2ac0265c6c37d3d07c9 100644
>--- a/LayoutTests/editing/spelling/spellcheck-async.html
>+++ b/LayoutTests/editing/spelling/spellcheck-async.html
>@@ -22,12 +22,13 @@ description("Test for Unified Spell Checker & Async Spell Checker.");
> 
> if (window.testRunner) {
>     testRunner.dumpAsText();
>-    testRunner.setAsynchronousSpellCheckingEnabled(true);
>     testRunner.waitUntilDone();
> }
> 
>-if (window.internals)
>+if (window.internals) {
>+    internals.settings.setAsynchronousSpellCheckingEnabled(true);
>     internals.settings.setUnifiedTextCheckerEnabled(true);
>+}
> 
> var container = document.getElementById('container');
> function removeChildren(node) {
>@@ -56,13 +57,8 @@ function doTestIfAny() {
> 
>     // No more tests.
>     removeChildren(container);
>-    if (window.internals)
>-        internals.settings.setUnifiedTextCheckerEnabled(false);
>-
>-    if (window.testRunner) {
>-        testRunner.setAsynchronousSpellCheckingEnabled(false);
>+    if (window.testRunner)
>         testRunner.notifyDone();
>-    }
> }
> 
> function createEditableElement(id) {
>diff --git a/LayoutTests/editing/spelling/spellcheck-paste-disabled.html b/LayoutTests/editing/spelling/spellcheck-paste-disabled.html
>index 91e249bd1d6af7740a1be25062ca8bdbac767a36..89feb8ff76298c3632b077e06b72604d1fc16133 100644
>--- a/LayoutTests/editing/spelling/spellcheck-paste-disabled.html
>+++ b/LayoutTests/editing/spelling/spellcheck-paste-disabled.html
>@@ -31,7 +31,7 @@ shouldBeTrue('internals.hasSpellingMarker(document, 0, 2)');
> window.getSelection().selectAllChildren(srcNode);
> document.execCommand('Copy');
> 
>-testRunner.setAsynchronousSpellCheckingEnabled(true);
>+internals.settings.setAsynchronousSpellCheckingEnabled(true);
> 
> var dstNode = document.getElementById('dst');
> dstNode.focus();
>@@ -51,7 +51,6 @@ function verifyMarker() {
>         testFailed('The destination node should not have a marker.');
>     else
>         testPassed('The destination node does not have any markers.');
>-    testRunner.setAsynchronousSpellCheckingEnabled(false);
>     finishJSTest();
> }
> window.setTimeout(verifyMarker, sleepPeriod);
>diff --git a/LayoutTests/editing/spelling/spellcheck-queue.html b/LayoutTests/editing/spelling/spellcheck-queue.html
>index c71e3d587d80541f1a6f6efdb85ff8bc2910cc59..b7205ae0ad0af04386dc07d6c92c4b9b1d7310f0 100644
>--- a/LayoutTests/editing/spelling/spellcheck-queue.html
>+++ b/LayoutTests/editing/spelling/spellcheck-queue.html
>@@ -10,10 +10,10 @@
> <script>
> description('For Bug 72939: Asynchronous SpellChecker should consider multiple requests.');
> 
>-if (window.testRunner) {
>+if (window.testRunner)
>     testRunner.waitUntilDone();
>-    testRunner.setAsynchronousSpellCheckingEnabled(true);
>-}
>+if (window.internals)
>+    internals.settings.setAsynchronousSpellCheckingEnabled(true);
> 
> var testRoot = document.createElement("div");
> document.body.insertBefore(testRoot, document.body.firstChild);
>@@ -80,10 +80,8 @@ function verifyIfAny()
>     }
> 
>     testRoot.style.display = "none";
>-    if (window.testRunner) {
>-        testRunner.setAsynchronousSpellCheckingEnabled(false);
>+    if (window.testRunner)
>         testRunner.notifyDone();
>-    }
> }
> 
> function findFirstTextNode(node)
>diff --git a/LayoutTests/editing/spelling/spellcheck-sequencenum.html b/LayoutTests/editing/spelling/spellcheck-sequencenum.html
>index 4543fd5af930889c9f7d29860e8df68146b4e869..0d0e677080144d6e4bce0bd1f44376cf804d7e61 100644
>--- a/LayoutTests/editing/spelling/spellcheck-sequencenum.html
>+++ b/LayoutTests/editing/spelling/spellcheck-sequencenum.html
>@@ -10,9 +10,9 @@
> <script>
> description('For Bug 73511: Internals should have a method to return the max sequence number of spellcheck request.');
> 
>-if (window.testRunner) {
>+if (window.internals) {
>     window.jsTestIsAsync = true;
>-    testRunner.setAsynchronousSpellCheckingEnabled(true);
>+    internals.settings.setAsynchronousSpellCheckingEnabled(true);
> }
> 
> var testRoot = document.createElement("div");
>@@ -77,10 +77,7 @@ function verifyIfAny()
>     }
> 
>     testRoot.style.display = "none";
>-    if (window.testRunner) {
>-        testRunner.setAsynchronousSpellCheckingEnabled(false);
>-        finishJSTest();
>-    }
>+    finishJSTest();
> }
> 
> function copyAndPaste(source, dest)
>diff --git a/LayoutTests/editing/spelling/spelling-marker-description.html b/LayoutTests/editing/spelling/spelling-marker-description.html
>index 3b2c556afe9f726f087a4abdfbeef6c4a7e47653..6264c55d5de15baa9cb050956f62cecbb8e03225 100644
>--- a/LayoutTests/editing/spelling/spelling-marker-description.html
>+++ b/LayoutTests/editing/spelling/spelling-marker-description.html
>@@ -10,17 +10,10 @@
> 
> <script>
> 
>-function done()
>-{
>-    testRunner.setAsynchronousSpellCheckingEnabled(false);
>-    internals.settings.setUnifiedTextCheckerEnabled(false);
>-    finishJSTest()
>-}
>-
> function verify(nretry)
> {
>     if (!nretry) {
>-       done();
>+       finishJSTest()
>        return;
>     }
> 
>@@ -37,7 +30,7 @@ function verify(nretry)
>     if (markedText != null) {
>         shouldBeEqualToString("markedText", "wellcome");
>         shouldBeEqualToString("markerDescription", "welcome");
>-        done();
>+        finishJSTest();
>     }
> 
>     // Wait until the async spellchecking is done.
>@@ -48,7 +41,7 @@ function test()
> {
>     jsTestIsAsync = true;
>     internals.settings.setUnifiedTextCheckerEnabled(true);
>-    testRunner.setAsynchronousSpellCheckingEnabled(true);
>+    internals.settings.setAsynchronousSpellCheckingEnabled(true);
> 
>     var sel = window.getSelection();
>     var destination = document.getElementById("destination");
>diff --git a/LayoutTests/platform/chromium/editing/spelling/delete-misspelled-word.html b/LayoutTests/platform/chromium/editing/spelling/delete-misspelled-word.html
>index 59ada5da83b0ce60e9a2397ce935b44585c3eba0..1e36f1ab9f71ee32682cd6e1d60d48859aede35f 100644
>--- a/LayoutTests/platform/chromium/editing/spelling/delete-misspelled-word.html
>+++ b/LayoutTests/platform/chromium/editing/spelling/delete-misspelled-word.html
>@@ -21,7 +21,7 @@ function insertText(text) {
> shouldBeTrue('insertText("z"); insertText("z"); insertText(" "); internals.hasSpellingMarker(document, 0, 2)');
> 
> debug('Enable asynchronous spellchecking, delete two characters, and insert a space');
>-testRunner.setAsynchronousSpellCheckingEnabled(true);
>+internals.settings.setAsynchronousSpellCheckingEnabled(true);
> internals.settings.setUnifiedTextCheckerEnabled(true);
> 
> testRunner.execCommand("DeleteBackward");
>@@ -36,8 +36,6 @@ function verifyMarker() {
>         return;
>     }
>     shouldBeFalse('internals.hasSpellingMarker(document, 0, 1)');
>-    internals.settings.setUnifiedTextCheckerEnabled(false);
>-    testRunner.setAsynchronousSpellCheckingEnabled(false);
>     finishJSTest();
> }
> window.setTimeout(verifyMarker, 1);
>diff --git a/LayoutTests/platform/chromium/editing/spelling/move-cursor-to-misspelled-word.html b/LayoutTests/platform/chromium/editing/spelling/move-cursor-to-misspelled-word.html
>index 60fc02edf314fed55b5243490aaee30deecd74c8..31d7d58feddbfcf549096a7766aa3dbb5a3a4084 100644
>--- a/LayoutTests/platform/chromium/editing/spelling/move-cursor-to-misspelled-word.html
>+++ b/LayoutTests/platform/chromium/editing/spelling/move-cursor-to-misspelled-word.html
>@@ -10,7 +10,7 @@ description('Test if Chrome WebKit does not remove a misspelled marker when movi
>             'To test manually, type a misspelled word "zz " and type a left-arrow key to move the cursor on it.' +
>             'This test succeeds when "zz" is marked as misspelled.');
> 
>-testRunner.setAsynchronousSpellCheckingEnabled(true);
>+internals.settings.setAsynchronousSpellCheckingEnabled(true);
> var node = document.getElementById('src');
> node.focus();
> document.execCommand("InsertText", false, 'z');
>@@ -18,7 +18,6 @@ document.execCommand("InsertText", false, 'z');
> document.execCommand("InsertText", false, ' ');
> window.getSelection().modify('move', 'backward', 'character');
> shouldBeTrue('internals.hasSpellingMarker(document, 0, 2)');
>-testRunner.setAsynchronousSpellCheckingEnabled(false);
> </script>
> <script src="../../../../fast/js/resources/js-test-post.js"></script>
> </body>

Actions: View | Formatted Diff | Diff

Attachments on bug 112362: 193148 | 193159 | 193344 | 193347 | 193356