| Index: content/shell/renderer/test_runner/SpellCheckClient.cpp
|
| diff --git a/content/shell/renderer/test_runner/SpellCheckClient.cpp b/content/shell/renderer/test_runner/SpellCheckClient.cpp
|
| index e4c1e650179c3f874f7aebb8471e83e7a6741a63..94b09ae0e2abaee5cda393a3e0cb0abc0e9a3149 100644
|
| --- a/content/shell/renderer/test_runner/SpellCheckClient.cpp
|
| +++ b/content/shell/renderer/test_runner/SpellCheckClient.cpp
|
| @@ -51,7 +51,7 @@ void SpellCheckClient::setDelegate(WebTestDelegate* delegate)
|
| void SpellCheckClient::spellCheck(const WebString& text, int& misspelledOffset, int& misspelledLength, WebVector<WebString>* optionalSuggestions)
|
| {
|
| // Check the spelling of the given text.
|
| - m_spellcheck.spellCheckWord(text, &misspelledOffset, &misspelledLength);
|
| + m_spellcheck.SpellCheckWord(text, &misspelledOffset, &misspelledLength);
|
| }
|
|
|
| void SpellCheckClient::checkTextOfParagraph(const WebString& text, WebTextCheckingTypeMask mask, WebVector<WebTextCheckingResult>* webResults)
|
| @@ -63,7 +63,8 @@ void SpellCheckClient::checkTextOfParagraph(const WebString& text, WebTextChecki
|
| while (offset < data.length()) {
|
| int misspelledPosition = 0;
|
| int misspelledLength = 0;
|
| - m_spellcheck.spellCheckWord(data.substr(offset), &misspelledPosition, &misspelledLength);
|
| + m_spellcheck.SpellCheckWord(
|
| + data.substr(offset), &misspelledPosition, &misspelledLength);
|
| if (!misspelledLength)
|
| break;
|
| WebTextCheckingResult result;
|
| @@ -96,7 +97,7 @@ void SpellCheckClient::requestCheckingOfText(
|
|
|
| m_lastRequestedTextCheckingCompletion = completion;
|
| m_lastRequestedTextCheckString = text;
|
| - if (m_spellcheck.hasInCache(text))
|
| + if (m_spellcheck.HasInCache(text))
|
| finishLastTextCheck();
|
| else
|
| m_delegate->postDelayedTask(new HostMethodTask(this, &SpellCheckClient::finishLastTextCheck), 0);
|
| @@ -109,15 +110,18 @@ void SpellCheckClient::finishLastTextCheck()
|
| std::vector<WebTextCheckingResult> results;
|
| int offset = 0;
|
| base::string16 text = m_lastRequestedTextCheckString;
|
| - if (!m_spellcheck.isMultiWordMisspelling(WebString(text), &results)) {
|
| + if (!m_spellcheck.IsMultiWordMisspelling(WebString(text), &results)) {
|
| while (text.length()) {
|
| int misspelledPosition = 0;
|
| int misspelledLength = 0;
|
| - m_spellcheck.spellCheckWord(WebString(text), &misspelledPosition, &misspelledLength);
|
| + m_spellcheck.SpellCheckWord(
|
| + WebString(text), &misspelledPosition, &misspelledLength);
|
| if (!misspelledLength)
|
| break;
|
| WebVector<WebString> suggestions;
|
| - m_spellcheck.fillSuggestionList(WebString(text.substr(misspelledPosition, misspelledLength)), &suggestions);
|
| + m_spellcheck.FillSuggestionList(
|
| + WebString(text.substr(misspelledPosition, misspelledLength)),
|
| + &suggestions);
|
| results.push_back(WebTextCheckingResult(WebTextDecorationTypeSpelling, offset + misspelledPosition, misspelledLength, suggestions.isEmpty() ? WebString() : suggestions[0]));
|
| text = text.substr(misspelledPosition + misspelledLength);
|
| offset += misspelledPosition + misspelledLength;
|
|
|