| Index: chrome/renderer/spellchecker/spellcheck_provider.cc
|
| diff --git a/chrome/renderer/spellchecker/spellcheck_provider.cc b/chrome/renderer/spellchecker/spellcheck_provider.cc
|
| index 53b30a9584f392be8d85377d1a85b8d619030859..310d636c1d7cf0791142c00b18d3fe0b20caec2f 100644
|
| --- a/chrome/renderer/spellchecker/spellcheck_provider.cc
|
| +++ b/chrome/renderer/spellchecker/spellcheck_provider.cc
|
| @@ -9,7 +9,6 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/renderer/spellchecker/spellcheck.h"
|
| #include "chrome/renderer/spellchecker/spellcheck_language.h"
|
| -#include "components/spellcheck/common/spellcheck_marker.h"
|
| #include "components/spellcheck/common/spellcheck_messages.h"
|
| #include "components/spellcheck/common/spellcheck_result.h"
|
| #include "content/public/renderer/render_view.h"
|
| @@ -34,8 +33,6 @@ static_assert(int(blink::WebTextDecorationTypeSpelling) ==
|
| int(SpellCheckResult::SPELLING), "mismatching enums");
|
| static_assert(int(blink::WebTextDecorationTypeGrammar) ==
|
| int(SpellCheckResult::GRAMMAR), "mismatching enums");
|
| -static_assert(int(blink::WebTextDecorationTypeInvisibleSpellcheck) ==
|
| - int(SpellCheckResult::INVISIBLE), "mismatching enums");
|
|
|
| SpellCheckProvider::SpellCheckProvider(
|
| content::RenderView* render_view,
|
| @@ -56,8 +53,7 @@ SpellCheckProvider::~SpellCheckProvider() {
|
|
|
| void SpellCheckProvider::RequestTextChecking(
|
| const base::string16& text,
|
| - WebTextCheckingCompletion* completion,
|
| - const std::vector<SpellCheckMarker>& markers) {
|
| + WebTextCheckingCompletion* completion) {
|
| // Ignore invalid requests.
|
| if (text.empty() || !HasWordCharacters(text, 0)) {
|
| completion->didCancelCheckingText();
|
| @@ -81,14 +77,12 @@ void SpellCheckProvider::RequestTextChecking(
|
| Send(new SpellCheckHostMsg_RequestTextCheck(
|
| routing_id(),
|
| text_check_completions_.Add(completion),
|
| - text,
|
| - markers));
|
| + text));
|
| #else
|
| Send(new SpellCheckHostMsg_CallSpellingService(
|
| routing_id(),
|
| text_check_completions_.Add(completion),
|
| - base::string16(text),
|
| - markers));
|
| + base::string16(text)));
|
| #endif // !USE_BROWSER_SPELLCHECKER
|
| }
|
|
|
| @@ -163,15 +157,8 @@ void SpellCheckProvider::checkTextOfParagraph(
|
|
|
| void SpellCheckProvider::requestCheckingOfText(
|
| const WebString& text,
|
| - const WebVector<uint32_t>& markers,
|
| - const WebVector<unsigned>& marker_offsets,
|
| WebTextCheckingCompletion* completion) {
|
| - std::vector<SpellCheckMarker> spellcheck_markers;
|
| - for (size_t i = 0; i < markers.size(); ++i) {
|
| - spellcheck_markers.push_back(
|
| - SpellCheckMarker(markers[i], marker_offsets[i]));
|
| - }
|
| - RequestTextChecking(text, completion, spellcheck_markers);
|
| + RequestTextChecking(text, completion);
|
| UMA_HISTOGRAM_COUNTS("SpellCheck.api.async", text.length());
|
| }
|
|
|
|
|