Changeset 96568 in webkit

Timestamp:

Oct 3, 2011 8:10:54 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Should call checkTextOfParagraph() indirectly to make unifying spell-checking code path easy.
​https://bugs.webkit.org/show_bug.cgi?id=69241

Patch by Shinya Kawanaka <​shinyak@google.com> on 2011-10-03
Reviewed by Ryosuke Niwa.

WebCore has two different code paths for spell-checking:

1) checkTextOfParagraph() for Snow Leopard or later
2) checkSpellingOfString() for checkGrammarOfString() for other platforms.

At the first step, this patch introduces an indirect wrapper to call
checkTextOfParagraph() in Snow Leopard or later. This is intended to make it easy to
introduce a function for mimicing checkTextOfParagraph() in Chromium platform or
other non-SL or non-Lion platform.

No new tests because this patch does not change a behavior.

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::hasMisspelling): Calling checkTextOfParagraph() indirectly.

• accessibility/mac/WebAccessibilityObjectWrapper.mm:

(AXAttributeStringSetSpelling): ditto.

• editing/Editor.cpp:

(WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): ditto.

• editing/TextCheckingHelper.cpp:

(WebCore::TextCheckingHelper::findFirstMisspellingOrBadGrammar): ditto.
(WebCore::TextCheckingHelper::guessesForMisspelledOrUngrammaticalRange): ditto.
(WebCore::checkTextOfParagraph): Added.

• editing/TextCheckingHelper.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityObject.cpp (modified) (1 diff)
• accessibility/mac/WebAccessibilityObjectWrapper.mm (modified) (1 diff)
• editing/Editor.cpp (modified) (1 diff)
• editing/TextCheckingHelper.cpp (modified) (3 diffs)
• editing/TextCheckingHelper.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-03  Shinya Kawanaka  <shinyak@google.com>
+
+        Should call checkTextOfParagraph() indirectly to make unifying spell-checking code path easy.
+        https://bugs.webkit.org/show_bug.cgi?id=69241
+
+        Reviewed by Ryosuke Niwa.
+
+        WebCore has two different code paths for spell-checking:
+          1) checkTextOfParagraph() for Snow Leopard or later
+          2) checkSpellingOfString() for checkGrammarOfString() for other platforms.
+
+        At the first step, this patch introduces an indirect wrapper to call
+        checkTextOfParagraph() in Snow Leopard or later. This is intended to make it easy to
+        introduce a function for mimicing checkTextOfParagraph() in Chromium platform or
+        other non-SL or non-Lion platform.
+
+        No new tests because this patch does not change a behavior.
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::hasMisspelling): Calling checkTextOfParagraph() indirectly.
+        * accessibility/mac/WebAccessibilityObjectWrapper.mm:
+        (AXAttributeStringSetSpelling): ditto.
+        * editing/Editor.cpp:
+        (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): ditto.
+        * editing/TextCheckingHelper.cpp:
+        (WebCore::TextCheckingHelper::findFirstMisspellingOrBadGrammar): ditto.
+        (WebCore::TextCheckingHelper::guessesForMisspelledOrUngrammaticalRange): ditto.
+        (WebCore::checkTextOfParagraph): Added.
+        * editing/TextCheckingHelper.h:
+
 2011-10-03  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -292 +292 @@
 #if USE(UNIFIED_TEXT_CHECKING)
     Vector<TextCheckingResult> results;
-    textChecker->checkTextOfParagraph(chars, charsLength, TextCheckingTypeSpelling, results);
+    checkTextOfParagraph(textChecker, chars, charsLength, TextCheckingTypeSpelling, results);
     if (!results.isEmpty())
         isMisspelled = true;

trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm

@@ -695 +695 @@
     // checkTextOfParagraph is the only spelling/grammar checker implemented in WK1 and WK2
     Vector<TextCheckingResult> results;
-    checker->checkTextOfParagraph(chars, charLength, TextCheckingTypeSpelling, results);
+    checkTextOfParagraph(checker, chars, charLength, TextCheckingTypeSpelling, results);
     
     size_t size = results.size();

trunk/Source/WebCore/editing/Editor.cpp

@@ -2143 +2143 @@
     Vector<TextCheckingResult> results;
     if (shouldMarkGrammar)
-        textChecker()->checkTextOfParagraph(grammarParagraph.textCharacters(), grammarParagraph.textLength(), 
+        checkTextOfParagraph(textChecker(), grammarParagraph.textCharacters(), grammarParagraph.textLength(), 
                                             resolveTextCheckingTypeMask(textCheckingOptions), results);
     else
-        textChecker()->checkTextOfParagraph(spellingParagraph.textCharacters(), spellingParagraph.textLength(), 
+        checkTextOfParagraph(textChecker(), spellingParagraph.textCharacters(), spellingParagraph.textLength(), 
                                             resolveTextCheckingTypeMask(textCheckingOptions), results);
         

trunk/Source/WebCore/editing/TextCheckingHelper.cpp

@@ -277 +277 @@
                 Vector<TextCheckingResult> results;
                 TextCheckingTypeMask checkingTypes = checkGrammar ? (TextCheckingTypeSpelling | TextCheckingTypeGrammar) : TextCheckingTypeSpelling;
-                m_client->textChecker()->checkTextOfParagraph(paragraphString.characters(), paragraphString.length(), checkingTypes, results);
+                checkTextOfParagraph(m_client->textChecker(), paragraphString.characters(), paragraphString.length(), checkingTypes, results);
                 
                 for (unsigned i = 0; i < results.size(); i++) {
@@ -527 +527 @@
     Vector<TextCheckingResult> results;
     TextCheckingTypeMask checkingTypes = checkGrammar ? (TextCheckingTypeSpelling | TextCheckingTypeGrammar) : TextCheckingTypeSpelling;
-    m_client->textChecker()->checkTextOfParagraph(paragraph.textCharacters(), paragraph.textLength(), checkingTypes, results);
+    checkTextOfParagraph(m_client->textChecker(), paragraph.textCharacters(), paragraph.textLength(), checkingTypes, results);
     
     for (unsigned i = 0; i < results.size(); i++) {
@@ -591 +591 @@
 }
 
-}
+void checkTextOfParagraph(TextCheckerClient* client, const UChar* text, int length,
+                          TextCheckingTypeMask checkingTypes, Vector<TextCheckingResult>& results)
+{
+#if USE(UNIFIED_TEXT_CHECKING)
+    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);
+#endif
+}
+
+}

trunk/Source/WebCore/editing/TextCheckingHelper.h

@@ -93 +93 @@
 };
 
+void checkTextOfParagraph(TextCheckerClient*, const UChar* text, int length,
+    TextCheckingTypeMask checkingTypes, Vector<TextCheckingResult>& results);
+
 } // namespace WebCore