Attachment 193148 Details for Bug 112362 – Patch

[patch] Patch

bug-112362-20130314104119.patch (text/plain), 34.82 KB, created by Rouslan Solomakhin on 2013-03-14 10:45:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rouslan Solomakhin

Created: 2013-03-14 10:45:23 PDT

Size: 34.82 KB

patch

obsolete

>Subversion Revision: 145820
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index cd1a7f8d8bf5aae5ca131f4a3dec15e716404fce..ace9de304f9ab50a0e18563d1b3fb4a5ae5bc311 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2013-03-14  Rouslan Solomakhin  <rouslan@chromium.org>
>+
>+        Backup and restore unified textchecker and async spellchecking settings
>+        https://bugs.webkit.org/show_bug.cgi?id=112362
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Backup and restore the settings unifiedTextCheckerEnabled and asynchronousSpellCheckingEnabled
>+        to avoid leaking settings between layout tests.
>+
>+        * testing/InternalSettings.cpp:
>+        (WebCore::InternalSettings::Backup::Backup): Backup unifiedTextCheckerEnabled and asynchronousSpellCheckingEnabled settings.
>+        (WebCore::InternalSettings::Backup::restoreTo): Restore unifiedTextCheckerEnabled and asynchronousSpellCheckingEnabled settings.
>+        * testing/InternalSettings.h:
>+        (Backup): Add a boolean to keep track of the original asynchronousSpellCheckingEnabled setting.
>+
> 2013-03-14  Brady Eidson  <beidson@apple.com>
> 
>         Add a mode to ResourceLoader that takes SharedBuffers instead of raw pointers and lengths.
>diff --git a/Source/WebCore/testing/InternalSettings.cpp b/Source/WebCore/testing/InternalSettings.cpp
>index c3f90d5d21fd024fc042885ec6014a8490ffe3b4..d39017e144509f39b86f952bc1028d883b5e7a0c 100644
>--- a/Source/WebCore/testing/InternalSettings.cpp
>+++ b/Source/WebCore/testing/InternalSettings.cpp
>@@ -74,6 +74,8 @@ InternalSettings::Backup::Backup(Settings* settings)
>     , m_originalStyleScoped(RuntimeEnabledFeatures::styleScopedEnabled())
> #endif
>     , m_originalEditingBehavior(settings->editingBehaviorType())
>+    , m_originalUnifiedSpellCheckerEnabled(settings->unifiedTextCheckerEnabled())
>+    , m_originalAsynchronousSpellCheckingEnabled(settings->asynchronousSpellCheckingEnabled())
> #if ENABLE(TEXT_AUTOSIZING)
>     , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled())
>     , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowSizeOverride())
>@@ -111,6 +113,8 @@ void InternalSettings::Backup::restoreTo(Settings* settings)
>     RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped);
> #endif
>     settings->setEditingBehaviorType(m_originalEditingBehavior);
>+    settings->setUnifiedTextCheckerEnabled(m_originalUnifiedSpellCheckerEnabled);
>+    settings->setAsynchronousSpellCheckingEnabled(m_originalAsynchronousSpellCheckingEnabled);
> #if ENABLE(TEXT_AUTOSIZING)
>     settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled);
>     settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindowSizeOverride);
>diff --git a/Source/WebCore/testing/InternalSettings.h b/Source/WebCore/testing/InternalSettings.h
>index 549b0fa45fa40b26dc848a52a25aa78a173a2c48..037fe632426d2235b48defae4edc7a8cf11da838 100644
>--- a/Source/WebCore/testing/InternalSettings.h
>+++ b/Source/WebCore/testing/InternalSettings.h
>@@ -61,6 +61,7 @@ public:
> #endif
>         EditingBehaviorType m_originalEditingBehavior;
>         bool m_originalUnifiedSpellCheckerEnabled;
>+        bool m_originalAsynchronousSpellCheckingEnabled;
> #if ENABLE(TEXT_AUTOSIZING)
>         bool m_originalTextAutosizingEnabled;
>         IntSize m_originalTextAutosizingWindowSizeOverride;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index bd920154f9b7cbd03acd1552ade7a19cfd84ed4d..fb3e0ff22e2a091161f180ffdcadc61f68f76ea1 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,26 @@
>+2013-03-14  Rouslan Solomakhin  <rouslan@chromium.org>
>+
>+        Move setAsynchronousSpellCheckingEnabled to internals.settings
>+        https://bugs.webkit.org/show_bug.cgi?id=112362
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-14  Simon Hausmann  <simon.hausmann@digia.com>
> 
>         [Qt] Disable DRT on Windows
>diff --git a/Tools/DumpRenderTree/TestRunner.cpp b/Tools/DumpRenderTree/TestRunner.cpp
>index 7d3e85e00743c24e127ad2c1efba6634c67ded36..8d3c9eeefc1e8ff826ad5d9961aae5dabc42f60f 100644
>--- a/Tools/DumpRenderTree/TestRunner.cpp
>+++ b/Tools/DumpRenderTree/TestRunner.cpp
>@@ -1543,16 +1543,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));
>@@ -2156,7 +2146,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 4f370c339c7cfa98e89f340029237b1b4854f1db..bd5e55d4ef5b21535c4033b53e27d9736182b3a5 100644
>--- a/Tools/DumpRenderTree/TestRunner.h
>+++ b/Tools/DumpRenderTree/TestRunner.h
>@@ -291,7 +291,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 645ae796881f3a41f0bc973783929209e43705dc..aab36fddfa4a5d0953837350e0bafd6c14fe474d 100644
>--- a/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp
>+++ b/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp
>@@ -583,11 +583,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 9754e2d4c4467c2580257bcd45a5b3b26516a378..35ccff9cc9260f1fa781a3331b840063c6916308 100644
>--- a/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
>+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
>@@ -227,7 +227,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.
>@@ -1686,15 +1685,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 25e7fe84589b7d8171fc619b09589cd1191608b1..fc524f1827d18e97aa252cb62e84f78005478c0d 100644
>--- a/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h
>+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h
>@@ -309,9 +309,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 e65b5a259e2c125da27cc9001ce7b418f36093d5..791ec09c1ceee028648adf8bf2a555eb4bb5848e 100644
>--- a/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp
>+++ b/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp
>@@ -689,11 +689,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 42ce6726d883e937eea5be8c0f64bd2e07f1c8c4..f796b744840853abd364afdd8fbba37b759c349d 100644
>--- a/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp
>+++ b/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp
>@@ -789,11 +789,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 b2326a26b349a083ba798a8c7b95ada9df05e366..d6d3436392d733c045704cfd04ad33505fad270f 100644
>--- a/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>+++ b/Tools/DumpRenderTree/mac/TestRunnerMac.mm
>@@ -792,11 +792,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 dc417ab61b988b7c1ebf39f6d2ec80c0b7ccc275..7d23f8835f41d6135cb7779462f756256051f6b0 100644
>--- a/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
>+++ b/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
>@@ -429,11 +429,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);
>@@ -1186,10 +1181,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 13f6a68fae60750275e1ffe6b8188e7c8221f177..f6b99ef77f4913196efc163bf09448404cc7f9ac 100644
>--- a/Tools/DumpRenderTree/qt/TestRunnerQt.h
>+++ b/Tools/DumpRenderTree/qt/TestRunnerQt.h
>@@ -144,7 +144,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 6648c3ee15dd4a56ee0b45b21e087fa8644e69f2..5921cb1c5766a516e19cce2ab8ee907b560fcc11 100644
>--- a/Tools/DumpRenderTree/win/TestRunnerWin.cpp
>+++ b/Tools/DumpRenderTree/win/TestRunnerWin.cpp
>@@ -978,11 +978,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 4753c29ca54f6aee1a9dca913d9b51ed501a9a1e..c10eef89f9e2d66d30e19d68a19825914b1183e3 100644
>--- a/Tools/DumpRenderTree/wx/TestRunnerWx.cpp
>+++ b/Tools/DumpRenderTree/wx/TestRunnerWx.cpp
>@@ -460,11 +460,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 60830f03c1d1abc110e933ca0f8b4a9f496d3cf4..6f003f8901910c7066716ed650f0c41c20bddc3f 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,28 @@
>+2013-03-14  Rouslan Solomakhin  <rouslan@chromium.org>
>+
>+        Move setAsynchronousSpellCheckingEnabled to internals.settings
>+        https://bugs.webkit.org/show_bug.cgi?id=112362
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Changed all tests from using testRunner.setAsynchronousSpellCheckingEnabled(bool)
>+        to use internals.settings.setAsynchronousSpellCheckingEnabled(bool).
>+
>+        * 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-14  Pavel Feldman  <pfeldman@chromium.org>
> 
>         Not reviewed: chromium expectations updated.
>diff --git a/LayoutTests/editing/spelling/grammar-markers-hidpi.html b/LayoutTests/editing/spelling/grammar-markers-hidpi.html
>index 10119eccdf904cad7053911548e1ac8bba59528a..473e39133ec9f8f340f03dc29a5acf4009dc4898 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,10 @@ var retry = 10;
> function trial() {
>     var hasMarker = internals.hasGrammarMarker(target, 4, 3);
>     if (hasMarker || --retry == 0) {
>-        if (window.testRunner) {
>-            testRunner.setAsynchronousSpellCheckingEnabled(false);
>+        if (window.internals)
>+            internals.settings.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..b7072c87a447702c986b64e6e047ccacef985f3f 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,10 @@ var retry = 10;
> function trial() {
>     var hasMarker = internals.hasGrammarMarker(target, 4, 3);
>     if (hasMarker || --retry == 0) {
>-        if (window.testRunner) {
>-            testRunner.setAsynchronousSpellCheckingEnabled(false);
>+        if (window.internals)
>+            internals.settings.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..05952136193cd98c011b4e9d604cf9b599966741 100644
>--- a/LayoutTests/editing/spelling/grammar-paste.html
>+++ b/LayoutTests/editing/spelling/grammar-paste.html
>@@ -49,7 +49,7 @@ function done()
>         return window.setTimeout(next, 0);
>     testRoot.style.display = "none";
> 
>-    testRunner.setAsynchronousSpellCheckingEnabled(false);
>+    internals.settings.setAsynchronousSpellCheckingEnabled(false);
>     testRunner.notifyDone();
> }
> 
>@@ -136,9 +136,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 cf8033418843cf20c6671e7c84907b7072d49520..e3bf06496a1e66879b998e9d3122e93fbbfdda6c 100644
>--- a/LayoutTests/editing/spelling/resources/util.js
>+++ b/LayoutTests/editing/spelling/resources/util.js
>@@ -20,15 +20,15 @@ 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);
>     testRunner.setSmartInsertDeleteEnabled(true);
>     testRunner.setSelectTrailingWhitespaceEnabled(false);
>+    internals.settings.setAsynchronousSpellCheckingEnabled(true);
>     internals.settings.setUnifiedTextCheckerEnabled(true);
>     internals.settings.setEditingBehavior("win");
>     var destination = document.getElementById(testElementId);
>diff --git a/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js b/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js
>index f309a878482ba78f13e437bac165cbcfdccdfaaa..ab3272698d8b1a2701ea2028c6c7b7e6511f7f63 100644
>--- a/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js
>+++ b/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js
>@@ -40,7 +40,7 @@ function done()
>         return window.setTimeout(next, 0);
>     testRoot.style.display = "none";
> 
>-    testRunner.setAsynchronousSpellCheckingEnabled(false);
>+    internals.settings.setAsynchronousSpellCheckingEnabled(false);
>     testRunner.notifyDone();
> }
> 
>@@ -94,8 +94,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..52522455b14f88a8dbee442a777e984d06f638b8 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,13 @@ function doTestIfAny() {
>     removeAllChildren(document.getElementById('container'));
>     removeAllChildren(document.getElementById('move-target'));
> 
>-    if (window.internals)
>+    if (window.internals) {
>         internals.settings.setUnifiedTextCheckerEnabled(false);
>+        internals.settings.setAsynchronousSpellCheckingEnabled(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..354452bde1ada9bb86f740ef0c9e465c13295ad0 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,13 @@ function doTestIfAny() {
> 
>     // No more tests.
>     removeChildren(container);
>-    if (window.internals)
>+    if (window.internals) {
>         internals.settings.setUnifiedTextCheckerEnabled(false);
>+        internals.settings.setAsynchronousSpellCheckingEnabled(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..a69162cfdf1e720cad6e876cd089a373564a0a44 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,7 @@ function verifyMarker() {
>         testFailed('The destination node should not have a marker.');
>     else
>         testPassed('The destination node does not have any markers.');
>-    testRunner.setAsynchronousSpellCheckingEnabled(false);
>+    internals.settings.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..182ac618c13eb2cf18600684929a0b85f393c85f 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,10 @@ function verifyIfAny()
>     }
> 
>     testRoot.style.display = "none";
>-    if (window.testRunner) {
>-        testRunner.setAsynchronousSpellCheckingEnabled(false);
>+    if (window.internals)
>+        internals.settings.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..52d95163f4af3d62abbae623517d3a8dca9ff3b9 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,8 +77,8 @@ function verifyIfAny()
>     }
> 
>     testRoot.style.display = "none";
>-    if (window.testRunner) {
>-        testRunner.setAsynchronousSpellCheckingEnabled(false);
>+    if (window.internals) {
>+        internals.settings.setAsynchronousSpellCheckingEnabled(false);
>         finishJSTest();
>     }
> }
>diff --git a/LayoutTests/editing/spelling/spelling-marker-description.html b/LayoutTests/editing/spelling/spelling-marker-description.html
>index 3b2c556afe9f726f087a4abdfbeef6c4a7e47653..9231e0be26ee99e32d11e41cf43e95ba88416dc0 100644
>--- a/LayoutTests/editing/spelling/spelling-marker-description.html
>+++ b/LayoutTests/editing/spelling/spelling-marker-description.html
>@@ -12,7 +12,7 @@
> 
> function done()
> {
>-    testRunner.setAsynchronousSpellCheckingEnabled(false);
>+    internals.settings.setAsynchronousSpellCheckingEnabled(false);
>     internals.settings.setUnifiedTextCheckerEnabled(false);
>     finishJSTest()
> }
>@@ -48,7 +48,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..9313badbc2f0e36c5eb500fc63689f92d52bc7d6 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");
>@@ -37,7 +37,7 @@ function verifyMarker() {
>     }
>     shouldBeFalse('internals.hasSpellingMarker(document, 0, 1)');
>     internals.settings.setUnifiedTextCheckerEnabled(false);
>-    testRunner.setAsynchronousSpellCheckingEnabled(false);
>+    internals.settings.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..961173f1aff3f1b15aa0e91e3b4cc2e2142a9cf9 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,7 @@ document.execCommand("InsertText", false, 'z');
> document.execCommand("InsertText", false, ' ');
> window.getSelection().modify('move', 'backward', 'character');
> shouldBeTrue('internals.hasSpellingMarker(document, 0, 2)');
>-testRunner.setAsynchronousSpellCheckingEnabled(false);
>+internals.settings.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