Remove spellchecker feedback.

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 5107 matching lines @@
     FrameTestHelpers::WebViewHelper webViewHelper(this);
     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 {
 public:
-    explicit SpellCheckClient(uint32_t hash = 0) : m_numberOfTimesChecked(0), m_hash(hash) { }
+    explicit SpellCheckClient() : m_numberOfTimesChecked(0) { }
     virtual ~SpellCheckClient() { }
-    void requestCheckingOfText(const WebString&, const WebVector<uint32_t>&, const WebVector<unsigned>&, WebTextCheckingCompletion* completion) override
+    void requestCheckingOfText(const WebString&, WebTextCheckingCompletion* completion) override
     {
         ++m_numberOfTimesChecked;
         Vector<WebTextCheckingResult> results;
         const int misspellingStartOffset = 1;
         const int misspellingLength = 8;
-        results.append(WebTextCheckingResult(WebTextDecorationTypeSpelling, misspellingStartOffset, misspellingLength, WebString(), m_hash));
+        results.append(WebTextCheckingResult(WebTextDecorationTypeSpelling, misspellingStartOffset, misspellingLength, WebString()));
         completion->didFinishCheckingText(results);
     }
     int numberOfTimesChecked() const { return m_numberOfTimesChecked; }
 private:
     int m_numberOfTimesChecked;
-    uint32_t m_hash;
 };
 
 TEST_P(ParameterizedWebFrameTest, ReplaceMisspelledRange)
 {
     registerMockedHttpURLLoad("spell.html");
     FrameTestHelpers::WebViewHelper webViewHelper(this);
     webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
     SpellCheckClient spellcheck;
     webViewHelper.webView()->setSpellCheckClient(&spellcheck);
 
@@ skipping 64 matching lines @@
     Element* element = document->getElementById("data");
 
     webViewHelper.webView()->settings()->setUnifiedTextCheckerEnabled(true);
     webViewHelper.webView()->settings()->setEditingBehavior(WebSettings::EditingBehaviorWin);
 
     element->focus();
     NonThrowableExceptionState exceptionState;
     document->execCommand("InsertText", false, " wellcome ", exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
 
-    WebVector<uint32_t> documentMarkers1;
-    webViewHelper.webView()->spellingMarkers(&documentMarkers1);
-    EXPECT_EQ(1U, documentMarkers1.size());
+    ASSERT_EQ(1U, document->markers().markers().size());
 
     Vector<String> words;
     words.append("wellcome");
     frame->removeSpellingMarkersUnderWords(words);
 
-    WebVector<uint32_t> documentMarkers2;
-    webViewHelper.webView()->spellingMarkers(&documentMarkers2);
-    EXPECT_EQ(0U, documentMarkers2.size());
-}
-
-TEST_P(ParameterizedWebFrameTest, MarkerHashIdentifiers)
-{
-    registerMockedHttpURLLoad("spell.html");
-    FrameTestHelpers::WebViewHelper webViewHelper(this);
-    webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
-
-    static const uint32_t kHash = 42;
-    SpellCheckClient spellcheck(kHash);
-    webViewHelper.webView()->setSpellCheckClient(&spellcheck);
-
-    WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
-    Document* document = frame->frame()->document();
-    Element* element = document->getElementById("data");
-
-    webViewHelper.webView()->settings()->setUnifiedTextCheckerEnabled(true);
-    webViewHelper.webView()->settings()->setEditingBehavior(WebSettings::EditingBehaviorWin);
-
-    element->focus();
-    NonThrowableExceptionState exceptionState;
-    document->execCommand("InsertText", false, "wellcome.", exceptionState);
-    EXPECT_FALSE(exceptionState.hadException());
-
-    WebVector<uint32_t> documentMarkers;
-    webViewHelper.webView()->spellingMarkers(&documentMarkers);
-    EXPECT_EQ(1U, documentMarkers.size());
-    EXPECT_EQ(kHash, documentMarkers[0]);
+    ASSERT_EQ(0U, document->markers().markers().size());
 }
 
 class StubbornSpellCheckClient : public WebSpellCheckClient {
 public:
     StubbornSpellCheckClient() : m_completion(0) { }
     virtual ~StubbornSpellCheckClient() { }
 
     virtual void requestCheckingOfText(
         const WebString&,
-        const WebVector<uint32_t>&,
-        const WebVector<unsigned>&,
         WebTextCheckingCompletion* completion) override
     {
         m_completion = completion;
     }
 
     void kickNoResults()
     {
         kick(-1, -1, WebTextDecorationTypeSpelling);
     }
 
     void kick()
     {
         kick(1, 8, WebTextDecorationTypeSpelling);
     }
 
-    void kickInvisibleSpellcheck()
-    {
-        kick(1, 8, WebTextDecorationTypeInvisibleSpellcheck);
-    }
-
 private:
     void kick(int misspellingStartOffset, int misspellingLength, WebTextDecorationType type)
     {
         if (!m_completion)
             return;
         Vector<WebTextCheckingResult> results;
         if (misspellingStartOffset >= 0 && misspellingLength > 0)
             results.append(WebTextCheckingResult(type, misspellingStartOffset, misspellingLength));
         m_completion->didFinishCheckingText(results);
         m_completion = 0;
@@ skipping 20 matching lines @@
 
     element->focus();
     NonThrowableExceptionState exceptionState;
     document->execCommand("InsertText", false, "wellcome ", exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
     document->execCommand("InsertText", false, "he", exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
 
     spellcheck.kick();
 
-    WebVector<uint32_t> documentMarkers;
-    webViewHelper.webView()->spellingMarkers(&documentMarkers);
-    EXPECT_EQ(0U, documentMarkers.size());
+    ASSERT_EQ(0U, document->markers().markers().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)
 {
     registerMockedHttpURLLoad("spell.html");
     FrameTestHelpers::WebViewHelper webViewHelper(this);
     webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
     webViewHelper.webView()->setSpellCheckClient(0);
@@ skipping 28 matching lines @@
 
     element->focus();
     NonThrowableExceptionState exceptionState;
     document->execCommand("InsertText", false, "welcome ", exceptionState);
 
     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::InvisibleSpellcheck);
-    EXPECT_EQ(2U, document->markers().markers().size());
+    EXPECT_EQ(1U, document->markers().markers().size());
 
     spellcheck.kickNoResults();
     EXPECT_EQ(0U, document->markers().markers().size());
 }
 
 TEST_P(ParameterizedWebFrameTest, SpellcheckResultsSavedInDocument)
 {
     registerMockedHttpURLLoad("spell.html");
     FrameTestHelpers::WebViewHelper webViewHelper(this);
     webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
@@ skipping 13 matching lines @@
     document->execCommand("InsertText", false, "wellcome ", exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
 
     spellcheck.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());
-
-    spellcheck.kickInvisibleSpellcheck();
-    ASSERT_EQ(1U, document->markers().markers().size());
-    ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers().markers()[0]);
-    EXPECT_EQ(DocumentMarker::InvisibleSpellcheck, document->markers().markers()[0]->type());
 }
 
 class TestAccessInitialDocumentWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     TestAccessInitialDocumentWebFrameClient() : m_didAccessInitialDocument(false)
     {
     }
 
     virtual void didAccessInitialDocument()
     {
@@ skipping 3386 matching lines @@
     request.setRequestorOrigin(WebSecurityOrigin::createUnique());
     helper.webView()->mainFrameImpl()->loadRequest(request);
 
     // Normally, the result of the JS url replaces the existing contents on the
     // Document. However, if the JS triggers a navigation, the contents should
     // not be replaced.
     EXPECT_EQ("", toLocalFrame(helper.webView()->page()->mainFrame())->document()->documentElement()->innerText());
 }
 
 } // namespace blink