Merge 86132 - 2011-05-10 MORITA Hajime <morrita@google.com>

Source/WebCore/editing/SpellChecker.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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 15 matching lines @@
 #include "config.h"
 #include "SpellChecker.h"
 
 #include "Document.h"
 #include "DocumentMarkerController.h"
 #include "EditorClient.h"
 #include "Frame.h"
 #include "HTMLInputElement.h"
 #include "HTMLTextAreaElement.h"
 #include "Node.h"
+#include "Page.h"
 #include "PositionIterator.h"
 #include "Range.h"
 #include "RenderObject.h"
 #include "Settings.h"
 #include "TextCheckerClient.h"
 #include "TextIterator.h"
 #include "htmlediting.h"
 
 namespace WebCore {
 
-SpellChecker::SpellChecker(Frame* frame, TextCheckerClient* client)
+SpellChecker::SpellChecker(Frame* frame)
     : m_frame(frame)
-    , m_client(client)
     , m_requestSequence(0)
 {
 }
 
 SpellChecker::~SpellChecker()
 {
 }
 
+TextCheckerClient* SpellChecker::client() const
+{
+    Page* page = m_frame->page();
+    if (!page)
+        return 0;
+    return page->editorClient()->textChecker();
+}
+
 bool SpellChecker::initRequest(Node* node)
 {
     ASSERT(canCheckAsynchronously(node));
 
     String text = node->textContent();
     if (!text.length())
         return false;
 
     m_requestNode = node;
     m_requestText = text;
     m_requestSequence++;
 
     return true;
 }
 
 void SpellChecker::clearRequest()
 {
     m_requestNode.clear();
     m_requestText = String();
 }
 
 bool SpellChecker::isAsynchronousEnabled() const
 {
     return m_frame->settings() && m_frame->settings()->asynchronousSpellCheckingEnabled();
 }
 
 bool SpellChecker::canCheckAsynchronously(Node* node) const
 {
-    return isCheckable(node) && isAsynchronousEnabled() && !isBusy();
+    return client() && isCheckable(node) && isAsynchronousEnabled() && !isBusy();
 }
 
 bool SpellChecker::isBusy() const
 {
     return m_requestNode.get();
 }
 
 bool SpellChecker::isValid(int sequence) const
 {
     return m_requestNode.get() && m_requestText.length() && m_requestSequence == sequence;
 }
 
 bool SpellChecker::isCheckable(Node* node) const
 {
     return node && node->renderer();
 }
 
 void SpellChecker::requestCheckingFor(TextCheckingTypeMask mask, Node* node)
 {
     ASSERT(canCheckAsynchronously(node));
 
     if (!initRequest(node))
         return;
-    m_client->requestCheckingOfString(this, m_requestSequence, mask, m_requestText);
+    client()->requestCheckingOfString(this, m_requestSequence, mask, m_requestText);
 }
 
 static bool forwardIterator(PositionIterator& iterator, int distance)
 {
     int remaining = distance;
     while (!iterator.atEnd()) {
         if (iterator.node()->isCharacterDataNode()) {
             int length = lastOffsetForEditing(iterator.node());
             int last = length - iterator.offsetInLeafNode();
             if (remaining < last) {
@@ skipping 57 matching lines @@
             m_requestNode->document()->markers()->addMarker(range.get(), toMarkerType(results[i].type));
 
         startOffset = results[i].location;
     }
 
     clearRequest();
 }
 
 
 } // namespace WebCore