Chromium Code Reviews| Index: chrome/renderer/spellchecker/spellcheck_provider.cc |
| diff --git a/chrome/renderer/spellchecker/spellcheck_provider.cc b/chrome/renderer/spellchecker/spellcheck_provider.cc |
| index 7389502c1bb88b77fb300fd9c91c5126c9de4bd0..840f3fb9508b9ed4b60ce2eaca1bebff3049ad34 100644 |
| --- a/chrome/renderer/spellchecker/spellcheck_provider.cc |
| +++ b/chrome/renderer/spellchecker/spellcheck_provider.cc |
| @@ -13,6 +13,7 @@ |
| #include "chrome/renderer/spellchecker/spellcheck.h" |
| #include "content/public/renderer/render_view.h" |
| #include "third_party/WebKit/public/platform/WebVector.h" |
| +#include "third_party/WebKit/public/web/WebDocument.h" |
| #include "third_party/WebKit/public/web/WebElement.h" |
| #include "third_party/WebKit/public/web/WebFrame.h" |
| #include "third_party/WebKit/public/web/WebTextCheckingCompletion.h" |
| @@ -20,6 +21,7 @@ |
| #include "third_party/WebKit/public/web/WebTextDecorationType.h" |
| #include "third_party/WebKit/public/web/WebView.h" |
| +using blink::WebElement; |
| using blink::WebFrame; |
| using blink::WebString; |
| using blink::WebTextCheckingCompletion; |
| @@ -109,17 +111,13 @@ bool SpellCheckProvider::OnMessageReceived(const IPC::Message& message) { |
| void SpellCheckProvider::FocusedNodeChanged(const blink::WebNode& unused) { |
| #if defined(OS_MACOSX) |
| - bool enabled = false; |
| - blink::WebElement element = render_view()->GetFocusedElement(); |
| - if (!element.isNull()) |
| - enabled = render_view()->IsEditableNode(element); |
| - |
| - bool checked = false; |
| - if (enabled && render_view()->GetWebView()) { |
| - WebFrame* frame = render_view()->GetWebView()->focusedFrame(); |
| - if (frame->isContinuousSpellCheckingEnabled()) |
| - checked = true; |
| - } |
| + WebFrame* frame = render_view()->GetWebView()->focusedFrame(); |
|
groby-ooo-7-16
2015/01/27 02:31:21
RenderViewImpl::GetFocusedElement() already does a
Evan Stade
2015/01/27 02:36:56
RenderView::GetFocusedElement() is going away (and
|
| + WebElement element = frame->document().isNull() ? WebElement() : |
| + frame->document().focusedElement(); |
| + bool enabled = !element.isNull() && render_view()->IsEditableNode(element); |
| + |
| + bool checked = enabled && render_view()->GetWebView() && |
| + frame->isContinuousSpellCheckingEnabled(); |
| Send(new SpellCheckHostMsg_ToggleSpellCheck(routing_id(), enabled, checked)); |
| #endif // OS_MACOSX |