Changeset 100050 in webkit

Timestamp:

Nov 11, 2011 5:21:44 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Implement legacy text check emulation in unified text check interface.
​https://bugs.webkit.org/show_bug.cgi?id=70299

Patch by Shinya Kawanaka <​shinyak@google.com> on 2011-11-11
Reviewed by Hajime Morita.

.:

• Source/autotools/symbols.filter:

Source/WebCore:

When UNIFIED_TEXT_CHECKING is off, WebCore::checkTextOfParagraph() emulates
TextCheckerClient::checkTextOfParagraph() using checkSpellingOfString and checkGrammarOfString.

This emulation can be used by setting the flag on.
This can be done by WebCore::Internals::setUnifiedTextCheckingEnabled.

Test: editing/spelling/spelling-unified-emulation.html

• editing/TextCheckingHelper.cpp:

(WebCore::findBadGrammars): Added.
(WebCore::findMisspellings): Added.
(WebCore::checkTextOfParagraph):

Emulates TextCheckerClients::checkTextOfParagraph if UNIFIED_TEXT_CHECKING is off.

• testing/Internals.cpp:

(WebCore::Internals::setUnifiedTextCheckingEnabled): flag setter.
(WebCore::Internals::unifiedTextCheckingEnabled): flag getter.

• testing/Internals.h:
• testing/Internals.idl:

Source/WebKit2:

• win/WebKit2.def:
• win/WebKit2CFLite.def:

LayoutTests:

Added tests for the case unified text checker is used when WebCore::checkTextOfParagraph() is not supported.

• editing/spelling/spelling-unified-emulation-expected.txt: Added.
• editing/spelling/spelling-unified-emulation.html: Added.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/spelling/spelling-unified-emulation-expected.txt (added)
• LayoutTests/editing/spelling/spelling-unified-emulation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/TextCheckingHelper.cpp (modified) (3 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/win/WebKit2.def (modified) (1 diff)
• Source/WebKit2/win/WebKit2CFLite.def (modified) (1 diff)
• Source/autotools/symbols.filter (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-11-11  Shinya Kawanaka  <shinyak@google.com>
+
+        Implement legacy text check emulation in unified text check interface.
+        https://bugs.webkit.org/show_bug.cgi?id=70299
+
+        Reviewed by Hajime Morita.
+
+        * Source/autotools/symbols.filter:
+
 2011-11-11  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-11  Shinya Kawanaka  <shinyak@google.com>
+
+        Implement legacy text check emulation in unified text check interface.
+        https://bugs.webkit.org/show_bug.cgi?id=70299
+
+        Reviewed by Hajime Morita.
+
+        Added tests for the case unified text checker is used when WebCore::checkTextOfParagraph() is not supported.
+
+        * editing/spelling/spelling-unified-emulation-expected.txt: Added.
+        * editing/spelling/spelling-unified-emulation.html: Added.
+
 2011-11-11  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-11  Shinya Kawanaka  <shinyak@google.com>
+
+        Implement legacy text check emulation in unified text check interface.
+        https://bugs.webkit.org/show_bug.cgi?id=70299
+
+        Reviewed by Hajime Morita.
+
+        When UNIFIED_TEXT_CHECKING is off, WebCore::checkTextOfParagraph() emulates
+        TextCheckerClient::checkTextOfParagraph() using checkSpellingOfString and checkGrammarOfString.
+
+        This emulation can be used by setting the flag on.
+        This can be done by WebCore::Internals::setUnifiedTextCheckingEnabled.
+
+        Test: editing/spelling/spelling-unified-emulation.html
+
+        * editing/TextCheckingHelper.cpp:
+        (WebCore::findBadGrammars): Added.
+        (WebCore::findMisspellings): Added.
+        (WebCore::checkTextOfParagraph):
+          Emulates TextCheckerClients::checkTextOfParagraph if UNIFIED_TEXT_CHECKING is off.
+        * testing/Internals.cpp:
+        (WebCore::Internals::setUnifiedTextCheckingEnabled): flag setter.
+        (WebCore::Internals::unifiedTextCheckingEnabled): flag getter.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2011-11-11  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebCore/editing/TextCheckingHelper.cpp

@@ -33 +33 @@
 #include "Range.h"
 #include "Settings.h"
+#include "TextBreakIterator.h"
 #include "TextCheckerClient.h"
 #include "TextIterator.h"
@@ -39 +40 @@
 
 namespace WebCore {
+
+#if !USE(UNIFIED_TEXT_CHECKING)
+static void findBadGrammars(TextCheckerClient* client, const UChar* text, int start, int length, Vector<TextCheckingResult>& results)
+{
+    ASSERT(WTF_USE_GRAMMAR_CHECKING);
+
+    int checkLocation = start;
+    int checkLength = length;
+
+    while (0 < checkLength) {
+        int badGrammarLocation = -1;
+        int badGrammarLength = 0;
+        Vector<GrammarDetail> badGrammarDetails;
+        client->checkGrammarOfString(text + checkLocation, checkLength, badGrammarDetails, &badGrammarLocation, &badGrammarLength);
+        if (!badGrammarLength)
+            break;
+        ASSERT(0 <= badGrammarLocation && badGrammarLocation <= checkLength);
+        ASSERT(0 < badGrammarLength && badGrammarLocation + badGrammarLength <= checkLength);
+        TextCheckingResult badGrammar;
+        badGrammar.type = TextCheckingTypeGrammar;
+        badGrammar.location = checkLocation + badGrammarLocation;
+        badGrammar.length = badGrammarLength;
+        badGrammar.details.swap(badGrammarDetails);
+        results.append(badGrammar);
+
+        checkLocation += (badGrammarLocation + badGrammarLength);
+        checkLength -= (badGrammarLocation + badGrammarLength);
+    }
+}
+
+static void findMisspellings(TextCheckerClient* client, const UChar* text, int start, int length, Vector<TextCheckingResult>& results)
+{
+    TextBreakIterator* iterator = wordBreakIterator(text + start, length);
+    if (!iterator)
+        return;
+    int wordStart = textBreakCurrent(iterator);
+    while (0 <= wordStart) {
+        int wordEnd = textBreakNext(iterator);
+        if (wordEnd < 0)
+            break;
+        int wordLength = wordEnd - wordStart;
+        int misspellingLocation = -1;
+        int misspellingLength = 0;
+        client->checkSpellingOfString(text + start + wordStart, wordLength, &misspellingLocation, &misspellingLength);
+        if (0 < misspellingLength) {
+            ASSERT(0 <= misspellingLocation && misspellingLocation <= wordLength);
+            ASSERT(0 < misspellingLength && misspellingLocation + misspellingLength <= wordLength);
+            TextCheckingResult misspelling;
+            misspelling.type = TextCheckingTypeSpelling;
+            misspelling.location = start + wordStart + misspellingLocation;
+            misspelling.length = misspellingLength;
+            misspelling.replacement = client->getAutoCorrectSuggestionForMisspelledWord(String(text + misspelling.location, misspelling.length));
+            results.append(misspelling);
+        }
+
+        wordStart = wordEnd;
+    }
+}
+#endif
 
 static PassRefPtr<Range> expandToParagraphBoundary(PassRefPtr<Range> range)
@@ -600 +660 @@
     client->checkTextOfParagraph(text, length, checkingTypes, results);
 #else
-    // Should implement later to unify unified spell-checking code path and
-    // legacy spell-checking code path.
-    ASSERT_NOT_REACHED();
-    UNUSED_PARAM(client);
-    UNUSED_PARAM(text);
-    UNUSED_PARAM(length);
-    UNUSED_PARAM(checkingTypes);
-    UNUSED_PARAM(results);
+    Vector<TextCheckingResult> spellingResult;
+    if (checkingTypes & TextCheckingTypeSpelling)
+        findMisspellings(client, text, 0, length, spellingResult);
+
+    Vector<TextCheckingResult> grammarResult;
+    if (checkingTypes & TextCheckingTypeGrammar) {
+        // Only checks grammartical error before the first misspellings
+        int grammarCheckLength = length;
+        for (size_t i = 0; i < spellingResult.size(); ++i) {
+            if (spellingResult[i].location < grammarCheckLength)
+                grammarCheckLength = spellingResult[i].location;
+        }
+
+        findBadGrammars(client, text, 0, grammarCheckLength, grammarResult);
+    }
+
+    if (grammarResult.size())
+        results.swap(grammarResult);
+
+    if (spellingResult.size()) {
+        if (results.isEmpty())
+            results.swap(spellingResult);
+        else
+            results.append(spellingResult);
+    }
 #endif
 }

trunk/Source/WebCore/testing/Internals.cpp

@@ -568 +568 @@
 }
 
-}
+void Internals::setUnifiedTextCheckingEnabled(Document* document, bool enabled, ExceptionCode& ec)
+{
+    if (!document || !document->frame() || !document->frame()->settings()) {
+        ec = INVALID_ACCESS_ERR;
+        return;
+    }
+
+    document->frame()->settings()->setUnifiedTextCheckerEnabled(enabled);
+}
+
+bool Internals::unifiedTextCheckingEnabled(Document* document, ExceptionCode& ec)
+{
+    if (!document || !document->frame() || !document->frame()->settings()) {
+        ec = INVALID_ACCESS_ERR;
+        return false;
+    }
+
+    return document->frame()->settings()->unifiedTextCheckerEnabled();
+}
+
+}

trunk/Source/WebCore/testing/Internals.h

@@ -104 +104 @@
     unsigned lengthFromRange(Element* scope, const Range*, ExceptionCode&);
 
+    void setUnifiedTextCheckingEnabled(Document*, bool, ExceptionCode&);
+    bool unifiedTextCheckingEnabled(Document*, ExceptionCode&);
+
     static const char* internalsId;
 

trunk/Source/WebCore/testing/Internals.idl

@@ -76 +76 @@
         unsigned long locationFromRange(in Element scope, in Range range) raises (DOMException);
         unsigned long lengthFromRange(in Element scope, in Range range) raises (DOMException);
+
+        void setUnifiedTextCheckingEnabled(in Document document, in boolean enabled) raises (DOMException);
+        boolean unifiedTextCheckingEnabled(in Document document) raises (DOMException);
     };
 }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-11  Shinya Kawanaka  <shinyak@google.com>
+
+        Implement legacy text check emulation in unified text check interface.
+        https://bugs.webkit.org/show_bug.cgi?id=70299
+
+        Reviewed by Hajime Morita.
+
+        * win/WebKit2.def:
+        * win/WebKit2CFLite.def:
+
 2011-11-11  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/win/WebKit2.def

@@ -177 +177 @@
         ?setSuggestedValue@HTMLInputElement@WebCore@@QAEXABVString@WTF@@@Z
         ?settings@Document@WebCore@@QBEPAVSettings@2@XZ
+        ?settings@Frame@WebCore@@QBEPAVSettings@2@XZ
         ?shadowRoot@Element@WebCore@@QBEPAVShadowRoot@2@XZ
         ?suggestedValue@HTMLInputElement@WebCore@@QBEABVString@WTF@@XZ

trunk/Source/WebKit2/win/WebKit2CFLite.def

@@ -170 +170 @@
         ?setSuggestedValue@HTMLInputElement@WebCore@@QAEXABVString@WTF@@@Z
         ?settings@Document@WebCore@@QBEPAVSettings@2@XZ
+        ?settings@Frame@WebCore@@QBEPAVSettings@2@XZ
         ?shadowRoot@Element@WebCore@@QBEPAVShadowRoot@2@XZ
         ?suggestedValue@HTMLInputElement@WebCore@@QBEABVString@WTF@@XZ

trunk/Source/autotools/symbols.filter

@@ -72 +72 @@
 _ZNK7WebCore20CachedResourceLoader11isPreloadedERKN3WTF6StringE;
 _ZNK7WebCore26HTMLTextFormControlElement21lastChangeWasUserEditEv;
+_ZNK7WebCore5Frame8settingsEv;
 _ZNK7WebCore6JSNode21pushEventHandlerScopeEPN3JSC9ExecStateEPNS1_14ScopeChainNodeE;
 _ZNK7WebCore7Element10shadowRootEv;