partial PageClickTracker migration to RenderFrameObserver

chrome/renderer/spellchecker/spellcheck_provider.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/spellcheck_marker.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "chrome/common/spellcheck_result.h"
 #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"
 #include "third_party/WebKit/public/web/WebTextCheckingResult.h"
 #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;
 using blink::WebTextCheckingResult;
 using blink::WebTextDecorationType;
 using blink::WebVector;
 
 static_assert(int(blink::WebTextDecorationTypeSpelling) ==
               int(SpellCheckResult::SPELLING), "mismatching enums");
 static_assert(int(blink::WebTextDecorationTypeGrammar) ==
@@ skipping 69 matching lines @@
     IPC_MESSAGE_HANDLER(SpellCheckMsg_RespondTextCheck, OnRespondTextCheck)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_ToggleSpellPanel, OnToggleSpellPanel)
 #endif
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 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);
+  WebFrame* frame = render_view()->GetWebView()->focusedFrame();

[groby-ooo-7-16, 2015/01/27 02:31:21]

RenderViewImpl::GetFocusedElement() already does all the frame stuff - I assume
this is lifted out because we need to use |frame| for |checked| anyways?

[Evan Stade, 2015/01/27 02:36:56]

RenderView::GetFocusedElement() is going away (and more generally, RenderView is
going away)

+  WebElement element = frame->document().isNull() ? WebElement() :
+      frame->document().focusedElement();
+  bool enabled = !element.isNull() && render_view()->IsEditableNode(element);
 
-  bool checked = false;
-  if (enabled && render_view()->GetWebView()) {
-    WebFrame* frame = render_view()->GetWebView()->focusedFrame();
-    if (frame->isContinuousSpellCheckingEnabled())
-      checked = true;
-  }
+  bool checked = enabled && render_view()->GetWebView() &&
+      frame->isContinuousSpellCheckingEnabled();
 
   Send(new SpellCheckHostMsg_ToggleSpellCheck(routing_id(), enabled, checked));
 #endif  // OS_MACOSX
 }
 
 void SpellCheckProvider::spellCheck(
     const WebString& text,
     int& offset,
     int& length,
     WebVector<WebString>* optional_suggestions) {
@@ skipping 220 matching lines @@
         results[i].length = last_results_[i].length;
         results[i].replacement = last_results_[i].replacement;
       }
       completion->didFinishCheckingText(results);
       return true;
     }
   }
 
   return false;
 }