Changeset 143192 in webkit

Timestamp:

Feb 18, 2013 3:33:43 AM (11 years ago)

Author:

g.czajkowski@samsung.com

Message:

[WK2][EFL] Unified text checker implementation
​https://bugs.webkit.org/show_bug.cgi?id=107682

Reviewed by Anders Carlsson.

Source/WebCore:

No new tests, covered by editing/spelling tests.

• platform/text/TextChecking.h:

(WebCore):
Enabling unified text checker feature for WebKit-EFL.

Source/WebKit/efl:

Add an empty checkTextOfParagraph implementation for WK1-EFL
to do not break build when WTF_USE_UNIFIED_TEXT_CHECKING
is enabled.

• WebCoreSupport/EditorClientEfl.h:

(EditorClientEfl):
(WebCore::EditorClientEfl::checkTextOfParagraph):

Source/WebKit2:

• UIProcess/efl/TextCheckerEfl.cpp:

(WebKit):
(WebKit::nextWordOffset):
Helper function to determine the word offset to do not call
client's checkSpellingOfString for the word separators.

(WebKit::TextChecker::checkTextOfParagraph):
Allow to check spelling for multiple words,
their misspelling location and length are saved to the vector.

• WebProcess/WebCoreSupport/WebEditorClient.h:

Add UNIFIED_TEXT_CHECKING guard to checkTextOfParagraph.

• WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp:

(WebKit):
(WebKit::WebEditorClient::checkTextOfParagraph):
As spelling implementation is exposed to UIProcess,
send a meesage to UIProcess to call TextChecker::checkTextOfParagraph.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/text/TextChecking.h (modified) (1 diff)
• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/WebCoreSupport/EditorClientEfl.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/efl/TextCheckerEfl.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-18  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        [WK2][EFL] Unified text checker implementation
+        https://bugs.webkit.org/show_bug.cgi?id=107682
+
+        Reviewed by Anders Carlsson.
+
+        No new tests, covered by editing/spelling tests.
+
+        * platform/text/TextChecking.h:
+        (WebCore):
+        Enabling unified text checker feature for WebKit-EFL.
+
 2013-02-18  Nico Weber  <thakis@chromium.org>
 

trunk/Source/WebCore/platform/text/TextChecking.h

@@ -40 +40 @@
 #define WTF_USE_GRAMMAR_CHECKING 1
 
-#if (PLATFORM(MAC) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)) || PLATFORM(BLACKBERRY)
+#if (PLATFORM(MAC) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)) || PLATFORM(BLACKBERRY) || PLATFORM(EFL)
 #define WTF_USE_UNIFIED_TEXT_CHECKING 1
 #endif

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2013-02-18  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        [WK2][EFL] Unified text checker implementation
+        https://bugs.webkit.org/show_bug.cgi?id=107682
+
+        Reviewed by Anders Carlsson.
+
+        Add an empty checkTextOfParagraph implementation for WK1-EFL
+        to do not break build when WTF_USE_UNIFIED_TEXT_CHECKING
+        is enabled.
+
+        * WebCoreSupport/EditorClientEfl.h:
+        (EditorClientEfl):
+        (WebCore::EditorClientEfl::checkTextOfParagraph):
+
 2013-02-15  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h

@@ -151 +151 @@
     virtual void setInputMethodState(bool enabled);
     virtual void requestCheckingOfString(WTF::PassRefPtr<WebCore::TextCheckingRequest>) { }
+#if USE(UNIFIED_TEXT_CHECKING)
+    virtual void checkTextOfParagraph(const UChar*, int, TextCheckingTypeMask, Vector<TextCheckingResult>&) { }
+#endif
     virtual TextCheckerClient* textChecker() { return this; }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-18  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        [WK2][EFL] Unified text checker implementation
+        https://bugs.webkit.org/show_bug.cgi?id=107682
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/efl/TextCheckerEfl.cpp:
+        (WebKit):
+        (WebKit::nextWordOffset):
+        Helper function to determine the word offset to do not call
+        client's checkSpellingOfString for the word separators.
+
+        (WebKit::TextChecker::checkTextOfParagraph):
+        Allow to check spelling for multiple words,
+        their misspelling location and length are saved to the vector.
+
+        * WebProcess/WebCoreSupport/WebEditorClient.h:
+        Add UNIFIED_TEXT_CHECKING guard to checkTextOfParagraph.
+
+        * WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp:
+        (WebKit):
+        (WebKit::WebEditorClient::checkTextOfParagraph):
+        As spelling implementation is exposed to UIProcess,
+        send a meesage to UIProcess to call TextChecker::checkTextOfParagraph.
+
 2013-02-18  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp

@@ -32 +32 @@
 
 #if ENABLE(SPELLCHECK)
+#include "TextBreakIterator.h"
 #include "WebTextChecker.h"
 #endif
@@ -124 +125 @@
 #endif
 }
+
+#if USE(UNIFIED_TEXT_CHECKING)
+static int nextWordOffset(const UChar* text, int length, int currentOffset)
+{
+    // FIXME: avoid creating textIterator object here, it could be passed as a parameter.
+    //        isTextBreak() leaves the iterator pointing to the first boundary position at
+    //        or after "offset" (ubrk_isBoundary side effect).
+    //        For many word separators, the method doesn't properly determine the boundaries
+    //        without resetting the iterator.
+    TextBreakIterator* textIterator = wordBreakIterator(text, length);
+    if (!textIterator)
+        return currentOffset;
+
+    int wordOffset = currentOffset;
+    while (wordOffset < length && isTextBreak(textIterator, wordOffset))
+        ++wordOffset;
+
+    // Do not treat the word's boundary as a separator.
+    if (!currentOffset && wordOffset == 1)
+        return currentOffset;
+
+    // Omit multiple separators.
+    if ((wordOffset - currentOffset) > 1)
+        --wordOffset;
+
+    return wordOffset;
+}
+
+Vector<TextCheckingResult> TextChecker::checkTextOfParagraph(int64_t spellDocumentTag, const UChar* text, int length, uint64_t checkingTypes)
+{
+    Vector<TextCheckingResult> paragraphCheckingResult;
+#if ENABLE(SPELLCHECK)
+    if (checkingTypes & TextCheckingTypeSpelling) {
+        TextBreakIterator* textIterator = wordBreakIterator(text, length);
+        if (!textIterator)
+            return paragraphCheckingResult;
+
+        // Omit the word separators at the beginning/end of the text to don't unnecessarily
+        // involve the client to check spelling for them.
+        int offset = nextWordOffset(text, length, 0);
+        int lengthStrip = length;
+        while (lengthStrip > 0 && isTextBreak(textIterator, lengthStrip - 1))
+            --lengthStrip;
+
+        while (offset >= 0 && offset < lengthStrip) {
+            int32_t misspellingLocation = -1;
+            int32_t misspellingLength = 0;
+            checkSpellingOfString(spellDocumentTag, text + offset, lengthStrip - offset, misspellingLocation, misspellingLength);
+            if (!misspellingLength)
+                break;
+
+            TextCheckingResult misspellingResult;
+            misspellingResult.type = TextCheckingTypeSpelling;
+            misspellingResult.location = offset + misspellingLocation;
+            misspellingResult.length = misspellingLength;
+            paragraphCheckingResult.append(misspellingResult);
+            offset += misspellingLocation + misspellingLength;
+            // Generally, we end up checking at the word separator, move to the adjacent word.
+            offset = nextWordOffset(text, lengthStrip, offset);
+        }
+    }
+#else
+    UNUSED_PARAM(spellDocumentTag);
+    UNUSED_PARAM(text);
+    UNUSED_PARAM(length);
+    UNUSED_PARAM(checkingTypes);
+#endif
+    return paragraphCheckingResult;
+}
+#endif
 
 void TextChecker::checkSpellingOfString(int64_t spellDocumentTag, const UChar* text, uint32_t length, int32_t& misspellingLocation, int32_t& misspellingLength)

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h

@@ -143 +143 @@
     virtual String getAutoCorrectSuggestionForMisspelledWord(const String& misspelledWord) OVERRIDE;
     virtual void checkGrammarOfString(const UChar*, int length, Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) OVERRIDE;
-#if PLATFORM(MAC)
+#if USE(UNIFIED_TEXT_CHECKING)
     virtual void checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, Vector<WebCore::TextCheckingResult>& results) OVERRIDE;
 #endif

trunk/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp

@@ -61 +61 @@
 }
 
+#if USE(UNIFIED_TEXT_CHECKING)
+void WebEditorClient::checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, Vector<TextCheckingResult>& results)
+{
+    m_page->sendSync(Messages::WebPageProxy::CheckTextOfParagraph(String(text, length), checkingTypes), Messages::WebPageProxy::CheckTextOfParagraph::Reply(results));
 }
+#endif
+
+}