Split WebTextCheckClient off WebSpellCheckClient

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 118 matching lines @@
 #include "public/web/WebHistoryItem.h"
 #include "public/web/WebPrintParams.h"
 #include "public/web/WebRange.h"
 #include "public/web/WebRemoteFrame.h"
 #include "public/web/WebScriptExecutionCallback.h"
 #include "public/web/WebScriptSource.h"
 #include "public/web/WebSearchableFormData.h"
 #include "public/web/WebSecurityPolicy.h"
 #include "public/web/WebSelection.h"
 #include "public/web/WebSettings.h"
-#include "public/web/WebSpellCheckClient.h"
+#include "public/web/WebTextCheckClient.h"
 #include "public/web/WebTextCheckingCompletion.h"
 #include "public/web/WebTextCheckingResult.h"
 #include "public/web/WebViewClient.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "v8/include/v8.h"
 #include "web/TextFinder.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebRemoteFrameImpl.h"
 #include "web/WebViewImpl.h"
@@ skipping 6107 matching lines @@
 TEST_P(ParameterizedWebFrameTest,
        MoveCaretSelectionTowardsWindowPointWithNoSelection) {
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad("about:blank", true);
   WebFrame* frame = webViewHelper.webView()->mainFrame();
 
   // This test passes if this doesn't crash.
   frame->toWebLocalFrame()->moveCaretSelection(WebPoint(0, 0));
 }
 
-class SpellCheckClient : public WebSpellCheckClient {
+class TextCheckClient : public WebTextCheckClient {
  public:
-  SpellCheckClient() : m_numberOfTimesChecked(0) {}
-  virtual ~SpellCheckClient() {}
+  TextCheckClient() : m_numberOfTimesChecked(0) {}
+  virtual ~TextCheckClient() {}
   void requestCheckingOfText(const WebString&,
                              WebTextCheckingCompletion* completion) override {
     ++m_numberOfTimesChecked;
     Vector<WebTextCheckingResult> results;
     const int misspellingStartOffset = 1;
     const int misspellingLength = 8;
     results.push_back(WebTextCheckingResult(WebTextDecorationTypeSpelling,
                                             misspellingStartOffset,
                                             misspellingLength, WebString()));
     completion->didFinishCheckingText(results);
   }
   int numberOfTimesChecked() const { return m_numberOfTimesChecked; }
 
  private:
   int m_numberOfTimesChecked;
 };
 
 TEST_P(ParameterizedWebFrameTest, ReplaceMisspelledRange) {
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
-  SpellCheckClient spellcheck;
-  webViewHelper.webView()->setSpellCheckClient(&spellcheck);
+  TextCheckClient textcheck;
+  webViewHelper.webView()->setTextCheckClient(&textcheck);
 
   WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   Document* document = frame->frame()->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exceptionState;
   document->execCommand("InsertText", false, "_wellcome_.", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
 
   if (RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled()) {
     document->frame()
         ->spellChecker()
         .idleSpellCheckCallback()
         .forceInvocationForTesting();
   }
 
   const int allTextBeginOffset = 0;
   const int allTextLength = 11;
   frame->selectRange(WebRange(allTextBeginOffset, allTextLength));
   EphemeralRange selectionRange =
       frame->frame()
           ->selection()
           .computeVisibleSelectionInDOMTreeDeprecated()
           .toNormalizedEphemeralRange();
 
-  EXPECT_EQ(1, spellcheck.numberOfTimesChecked());
+  EXPECT_EQ(1, textcheck.numberOfTimesChecked());
   EXPECT_EQ(1U, document->markers()
                     .markersInRange(selectionRange, DocumentMarker::Spelling)
                     .size());
 
   frame->replaceMisspelledRange("welcome");
   EXPECT_EQ("_welcome_.",
             WebFrameContentDumper::dumpWebViewAsText(
                 webViewHelper.webView(), std::numeric_limits<size_t>::max())
                 .utf8());
 }
 
 TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkers) {
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
-  SpellCheckClient spellcheck;
-  webViewHelper.webView()->setSpellCheckClient(&spellcheck);
+  TextCheckClient textcheck;
+  webViewHelper.webView()->setTextCheckClient(&textcheck);
 
   WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   Document* document = frame->frame()->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exceptionState;
@@ skipping 20 matching lines @@
 
   EXPECT_EQ(0U, document->markers()
                     .markersInRange(selectionRange, DocumentMarker::Spelling)
                     .size());
 }
 
 TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkersUnderWords) {
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
-  SpellCheckClient spellcheck;
-  webViewHelper.webView()->setSpellCheckClient(&spellcheck);
+  TextCheckClient textcheck;
+  webViewHelper.webView()->setTextCheckClient(&textcheck);
 
   LocalFrame* frame = webViewHelper.webView()->mainFrameImpl()->frame();
   Document* document = frame->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exceptionState;
   document->execCommand("InsertText", false, " wellcome ", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
 
   if (RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
     frame->spellChecker().idleSpellCheckCallback().forceInvocationForTesting();
 
   WebVector<unsigned> offsets1;
   webViewHelper.webView()->spellingMarkerOffsetsForTest(&offsets1);
   EXPECT_EQ(1U, offsets1.size());
 
   Vector<String> words;
   words.push_back("wellcome");
   frame->removeSpellingMarkersUnderWords(words);
 
   WebVector<unsigned> offsets2;
   webViewHelper.webView()->spellingMarkerOffsetsForTest(&offsets2);
   EXPECT_EQ(0U, offsets2.size());
 }
 
-class StubbornSpellCheckClient : public WebSpellCheckClient {
+class StubbornTextCheckClient : public WebTextCheckClient {
  public:
-  StubbornSpellCheckClient() : m_completion(0) {}
-  virtual ~StubbornSpellCheckClient() {}
+  StubbornTextCheckClient() : m_completion(0) {}
+  virtual ~StubbornTextCheckClient() {}
 
   virtual void requestCheckingOfText(
       const WebString&,
       WebTextCheckingCompletion* completion) override {
     m_completion = completion;
   }
 
   void cancelAllPendingRequests() override {
     if (!m_completion)
       return;
@@ skipping 22 matching lines @@
   }
 
   WebTextCheckingCompletion* m_completion;
 };
 
 TEST_P(ParameterizedWebFrameTest, SlowSpellcheckMarkerPosition) {
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
 
-  StubbornSpellCheckClient spellcheck;
-  webViewHelper.webView()->setSpellCheckClient(&spellcheck);
+  StubbornTextCheckClient textcheck;
+  webViewHelper.webView()->setTextCheckClient(&textcheck);
 
   WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   Document* document = frame->frame()->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exceptionState;
   document->execCommand("InsertText", false, "wellcome ", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
   document->execCommand("InsertText", false, "he", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
 
   if (RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled()) {
     document->frame()
         ->spellChecker()
         .idleSpellCheckCallback()
         .forceInvocationForTesting();
   }
 
-  spellcheck.kick();
+  textcheck.kick();
 
   WebVector<unsigned> offsets;
   webViewHelper.webView()->spellingMarkerOffsetsForTest(&offsets);
   EXPECT_EQ(0U, offsets.size());
 }
 
 // This test verifies that cancelling spelling request does not cause a
 // write-after-free when there's no spellcheck client set.
 TEST_P(ParameterizedWebFrameTest, CancelSpellingRequestCrash) {
   // The relevant code paths are obsolete with idle time spell checker.
   if (RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
     return;
 
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
-  webViewHelper.webView()->setSpellCheckClient(0);
+  webViewHelper.webView()->setTextCheckClient(0);
 
   WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   Document* document = frame->frame()->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   frame->frame()->editor().replaceSelectionWithText(
       "A", false, false, InputEvent::InputType::InsertReplacementText);
   frame->frame()->spellChecker().cancelCheck();
 }
 
 TEST_P(ParameterizedWebFrameTest, SpellcheckResultErasesMarkers) {
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
 
-  StubbornSpellCheckClient spellcheck;
-  webViewHelper.webView()->setSpellCheckClient(&spellcheck);
+  StubbornTextCheckClient textcheck;
+  webViewHelper.webView()->setTextCheckClient(&textcheck);
 
   WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   Document* document = frame->frame()->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exceptionState;
   document->execCommand("InsertText", false, "welcome ", exceptionState);
 
   if (RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled()) {
     document->frame()
         ->spellChecker()
         .idleSpellCheckCallback()
         .forceInvocationForTesting();
   }
 
   document->updateStyleAndLayout();
 
   EXPECT_FALSE(exceptionState.hadException());
   auto range = EphemeralRange::rangeOfContents(*element);
   document->markers().addMarker(range.startPosition(), range.endPosition(),
                                 DocumentMarker::Spelling);
   document->markers().addMarker(range.startPosition(), range.endPosition(),
                                 DocumentMarker::Grammar);
   EXPECT_EQ(2U, document->markers().markers().size());
 
-  spellcheck.kickNoResults();
+  textcheck.kickNoResults();
   EXPECT_EQ(0U, document->markers().markers().size());
 }
 
 TEST_P(ParameterizedWebFrameTest, SpellcheckResultsSavedInDocument) {
   registerMockedHttpURLLoad("spell.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   initializeTextSelectionWebView(m_baseURL + "spell.html", &webViewHelper);
 
-  StubbornSpellCheckClient spellcheck;
-  webViewHelper.webView()->setSpellCheckClient(&spellcheck);
+  StubbornTextCheckClient textcheck;
+  webViewHelper.webView()->setTextCheckClient(&textcheck);
 
   WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   Document* document = frame->frame()->document();
   Element* element = document->getElementById("data");
 
   webViewHelper.webView()->settings()->setEditingBehavior(
       WebSettings::EditingBehaviorWin);
 
   element->focus();
   NonThrowableExceptionState exceptionState;
   document->execCommand("InsertText", false, "wellcome ", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
 
   if (RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled()) {
     document->frame()
         ->spellChecker()
         .idleSpellCheckCallback()
         .forceInvocationForTesting();
   }
 
-  spellcheck.kick();
+  textcheck.kick();
   ASSERT_EQ(1U, document->markers().markers().size());
   ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers().markers()[0]);
   EXPECT_EQ(DocumentMarker::Spelling, document->markers().markers()[0]->type());
 
   document->execCommand("InsertText", false, "wellcome ", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
 
   if (RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled()) {
     document->frame()
         ->spellChecker()
         .idleSpellCheckCallback()
         .forceInvocationForTesting();
   }
 
-  spellcheck.kickGrammar();
+  textcheck.kickGrammar();
   ASSERT_EQ(1U, document->markers().markers().size());
   ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers().markers()[0]);
   EXPECT_EQ(DocumentMarker::Grammar, document->markers().markers()[0]->type());
 }
 
 class TestAccessInitialDocumentWebFrameClient
     : public FrameTestHelpers::TestWebFrameClient {
  public:
   TestAccessInitialDocumentWebFrameClient()
       : m_didAccessInitialDocument(false) {}
@@ skipping 4917 matching lines @@
   FrameTestHelpers::loadFrame(localFrame, "data:text/html,some page");
 
   // Local frame with remote parent should have transparent baseBackgroundColor.
   Color color = localFrame->frameView()->baseBackgroundColor();
   EXPECT_EQ(Color::transparent, color);
 
   view->close();
 }
 
 }  // namespace blink