Changeset 120423 in webkit

Timestamp:

Jun 15, 2012 1:41:30 AM (12 years ago)

Author:

hbono@chromium.org

Message:

Allow platforms to choose whether to remove markers on editing
​https://bugs.webkit.org/show_bug.cgi?id=88838

Reviewed by Hajime Morita.

Source/WebCore:

This change allows platforms to choose whether to remove markers on a word being
edited. WebKit does not remove markers when we move a selection to a markered
word on platforms that shouldEraseMarkersAfterChangeSelection returns false.
On such platforms, WebKit expects to set WTF_USE_MARKER_REMOVAL_UPON_EDITING to
1 so Editor::updateMarkersForWordsAffectedByEditing can remove markers. This
change also checks the return value of shouldEraseMarkersAfterChangeSelection so
platform can choose it. This change also adds grammar markers so it can also
remove grammar markers.

Test: editing/spelling/grammar-edit-word.html

• editing/Editor.cpp:

(WebCore::Editor::updateMarkersForWordsAffectedByEditing):

Source/WebKit/chromium:

This change implements EditorClientImpl::checkGrammarOfString so
DumpRenderTree can run grammar tests.

• src/EditorClientImpl.cpp:

(WebKit::EditorClientImpl::isGrammarCheckingEnabled): Return true also when unified text-checking is enabled.
(WebKit::EditorClientImpl::shouldEraseMarkersAfterChangeSelection): ditto.
(WebKit::EditorClientImpl::checkGrammarOfString): Implement this function with our unified text-checker.

Tools:

This change implements WebViewHost::checkTextOfParagraph so DumpRenderTree can
run grammar tests.

• DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::checkTextOfParagraph): Implement this function with our mock spell checker and grammar checker.

• DumpRenderTree/chromium/WebViewHost.h:

(WebViewHost): Override WebSpellCheckClient::checkTextOfParagraph.

LayoutTests:

This change adds a test that verifies WebKit removes a grammar marker from a
grammatically-incorrect word when editing the word.

• editing/spelling/grammar-edit-word-expected.txt: Added.
• editing/spelling/grammar-edit-word.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/spelling/grammar-edit-word-expected.txt (added)
• LayoutTests/editing/spelling/grammar-edit-word.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/Editor.cpp (modified) (2 diffs)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/EditorClientImpl.cpp (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/WebViewHost.cpp (modified) (1 diff)
• Tools/DumpRenderTree/chromium/WebViewHost.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-15  Hironori Bono  <hbono@chromium.org>
+
+        Allow platforms to choose whether to remove markers on editing
+        https://bugs.webkit.org/show_bug.cgi?id=88838
+
+        Reviewed by Hajime Morita.
+
+        This change adds a test that verifies WebKit removes a grammar marker from a
+        grammatically-incorrect word when editing the word.
+
+        * editing/spelling/grammar-edit-word-expected.txt: Added.
+        * editing/spelling/grammar-edit-word.html: Added.
+
 2012-06-15  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-15  Hironori Bono  <hbono@chromium.org>
+
+        Allow platforms to choose whether to remove markers on editing
+        https://bugs.webkit.org/show_bug.cgi?id=88838
+
+        Reviewed by Hajime Morita.
+
+        This change allows platforms to choose whether to remove markers on a word being
+        edited. WebKit does not remove markers when we move a selection to a markered
+        word on platforms that shouldEraseMarkersAfterChangeSelection returns false.
+        On such platforms, WebKit expects to set WTF_USE_MARKER_REMOVAL_UPON_EDITING to
+        1 so Editor::updateMarkersForWordsAffectedByEditing can remove markers. This
+        change also checks the return value of shouldEraseMarkersAfterChangeSelection so
+        platform can choose it. This change also adds grammar markers so it can also
+        remove grammar markers.
+
+        Test: editing/spelling/grammar-edit-word.html
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::updateMarkersForWordsAffectedByEditing):
+
 2012-06-15  Andrey Adaikin  <aandrey@chromium.org>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -2204 +2204 @@
 void Editor::updateMarkersForWordsAffectedByEditing(bool doNotRemoveIfSelectionAtWordBoundary)
 {
-    if (!m_alternativeTextController->shouldRemoveMarkersUponEditing())
+    if (!m_alternativeTextController->shouldRemoveMarkersUponEditing() && (!textChecker() || textChecker()->shouldEraseMarkersAfterChangeSelection(TextCheckingTypeSpelling)))
         return;
 
@@ -2272 +2272 @@
         m_alternativeTextController->removeDictationAlternativesForMarker(markers[i]);
 
-    document->markers()->removeMarkers(wordRange.get(), DocumentMarker::Spelling | DocumentMarker::CorrectionIndicator | DocumentMarker::SpellCheckingExemption | DocumentMarker::DictationAlternatives, DocumentMarkerController::RemovePartiallyOverlappingMarker);
+    document->markers()->removeMarkers(wordRange.get(), DocumentMarker::Spelling | DocumentMarker::Grammar | DocumentMarker::CorrectionIndicator | DocumentMarker::SpellCheckingExemption | DocumentMarker::DictationAlternatives, DocumentMarkerController::RemovePartiallyOverlappingMarker);
     document->markers()->clearDescriptionOnMarkersIntersectingRange(wordRange.get(), DocumentMarker::Replacement);
 }

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-06-15  Hironori Bono  <hbono@chromium.org>
+
+        Allow platforms to choose whether to remove markers on editing
+        https://bugs.webkit.org/show_bug.cgi?id=88838
+
+        Reviewed by Hajime Morita.
+
+        This change implements EditorClientImpl::checkGrammarOfString so
+        DumpRenderTree can run grammar tests.
+
+        * src/EditorClientImpl.cpp:
+        (WebKit::EditorClientImpl::isGrammarCheckingEnabled): Return true also when unified text-checking is enabled.
+        (WebKit::EditorClientImpl::shouldEraseMarkersAfterChangeSelection): ditto.
+        (WebKit::EditorClientImpl::checkGrammarOfString): Implement this function with our unified text-checker.
+
 2012-06-14  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp

@@ -171 +171 @@
 {
     const Frame* frame = m_webView->focusedWebCoreFrame();
-    return frame && frame->settings() && frame->settings()->asynchronousSpellCheckingEnabled();
+    return frame && frame->settings() && (frame->settings()->asynchronousSpellCheckingEnabled() || frame->settings()->unifiedTextCheckerEnabled());
 }
 
@@ -704 +704 @@
 {
     const Frame* frame = m_webView->focusedWebCoreFrame();
-    return !frame || !frame->settings() || !frame->settings()->asynchronousSpellCheckingEnabled();
+    return !frame || !frame->settings() || (!frame->settings()->asynchronousSpellCheckingEnabled() && !frame->settings()->unifiedTextCheckerEnabled());
 }
 
@@ -767 +767 @@
 }
 
-void EditorClientImpl::checkGrammarOfString(const UChar*, int length,
-                                            WTF::Vector<GrammarDetail>&,
-                                            int* badGrammarLocation,
-                                            int* badGrammarLength)
-{
-    notImplemented();
+void EditorClientImpl::checkGrammarOfString(const UChar* text, int length, WTF::Vector<GrammarDetail>& details, int* badGrammarLocation, int* badGrammarLength)
+{
     if (badGrammarLocation)
         *badGrammarLocation = -1;
     if (badGrammarLength)
         *badGrammarLength = 0;
+
+    if (!m_webView->spellCheckClient())
+        return;
+    WebVector<WebTextCheckingResult> webResults;
+    m_webView->spellCheckClient()->checkTextOfParagraph(WebString(text, length), WebTextCheckingTypeGrammar, &webResults);
+    if (!webResults.size())
+        return;
+
+    // Convert a list of WebTextCheckingResults to a list of GrammarDetails. If
+    // the converted vector of GrammarDetails has grammar errors, we set
+    // badGrammarLocation and badGrammarLength to tell WebKit that the input
+    // text has grammar errors.
+    for (size_t i = 0; i < webResults.size(); ++i) {
+        if (webResults[i].type == WebTextCheckingTypeGrammar) {
+            GrammarDetail detail;
+            detail.location = webResults[i].location;
+            detail.length = webResults[i].length;
+            detail.userDescription = webResults[i].replacement;
+            details.append(detail);
+        }
+    }
+    if (!details.size())
+        return;
+    if (badGrammarLocation)
+        *badGrammarLocation = 0;
+    if (badGrammarLength)
+        *badGrammarLength = length;
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-06-15  Hironori Bono  <hbono@chromium.org>
+
+        Allow platforms to choose whether to remove markers on editing
+        https://bugs.webkit.org/show_bug.cgi?id=88838
+
+        Reviewed by Hajime Morita.
+
+        This change implements WebViewHost::checkTextOfParagraph so DumpRenderTree can
+        run grammar tests.
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::checkTextOfParagraph): Implement this function with our mock spell checker and grammar checker.
+        * DumpRenderTree/chromium/WebViewHost.h:
+        (WebViewHost): Override WebSpellCheckClient::checkTextOfParagraph.
+
 2012-06-15  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -466 +466 @@
     // Check the spelling of the given text.
     m_spellcheck.spellCheckWord(text, &misspelledOffset, &misspelledLength);
+}
+
+void WebViewHost::checkTextOfParagraph(const WebString& text, WebTextCheckingTypeMask mask, WebVector<WebTextCheckingResult>* webResults)
+{
+    Vector<WebTextCheckingResult> results;
+    if (mask & WebTextCheckingTypeSpelling) {
+        size_t offset = 0;
+        size_t length = text.length();
+        const WebUChar* data = text.data();
+        while (offset < length) {
+            int misspelledPosition = 0;
+            int misspelledLength = 0;
+            m_spellcheck.spellCheckWord(WebString(&data[offset], length - offset), &misspelledPosition, &misspelledLength);
+            if (!misspelledLength)
+                break;
+            WebTextCheckingResult result;
+            result.type = WebTextCheckingTypeSpelling;
+            result.location = offset + misspelledPosition;
+            result.length = misspelledLength;
+            results.append(result);
+            offset += misspelledPosition + misspelledLength;
+        }
+    }
+    if (mask & WebTextCheckingTypeGrammar)
+        MockGrammarCheck::checkGrammarOfString(text, &results);
+    webResults->assign(results);
 }
 

trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

@@ -137 +137 @@
     // WebKit::WebSpellCheckClient
     virtual void spellCheck(const WebKit::WebString&, int& offset, int& length, WebKit::WebVector<WebKit::WebString>* optionalSuggestions);
+    virtual void checkTextOfParagraph(const WebKit::WebString&, WebKit::WebTextCheckingTypeMask, WebKit::WebVector<WebKit::WebTextCheckingResult>*);
     virtual void requestCheckingOfText(const WebKit::WebString&, WebKit::WebTextCheckingCompletion*);
     virtual WebKit::WebString autoCorrectWord(const WebKit::WebString&);