1 files changed, 17 insertions, 2 deletions
diff --git a/Source/WebKit/chromium/src/WebTextCheckingCompletionImpl.cpp b/Source/WebKit/chromium/src/WebTextCheckingCompletionImpl.cpp
index 957663634..d7a9be01c 100644
--- a/Source/WebKit/chromium/src/WebTextCheckingCompletionImpl.cpp
+++ b/Source/WebKit/chromium/src/WebTextCheckingCompletionImpl.cpp
@@ -31,6 +31,7 @@
 #include "config.h"
 #include "WebTextCheckingCompletionImpl.h"
 
+#include "EditorClientImpl.h"
 #include "SpellChecker.h"
 #include "TextCheckerClient.h"
 #include "WebTextCheckingResult.h"
@@ -51,14 +52,28 @@ static Vector<TextCheckingResult> toCoreResults(const WebVector<WebTextCheckingR
 
 void WebTextCheckingCompletionImpl::didFinishCheckingText(const WebVector<WebTextCheckingResult>& results)
 {
-    m_spellChecker->didCheckSucceeded(m_identifier, toCoreResults(results));
+    if (m_spellChecker) {
+        m_spellChecker->didCheckSucceeded(m_identifier, toCoreResults(results));
+        m_editorClient->didCheckString(this);
+    }
+
     delete this;
 }
 
 void WebTextCheckingCompletionImpl::didCancelCheckingText()
 {
-    m_spellChecker->didCheckCanceled(m_identifier);
+    if (m_spellChecker) {
+        m_spellChecker->didCheckCanceled(m_identifier);
+        m_editorClient->didCheckString(this);
+    }
+
     delete this;
 }
 
+void WebTextCheckingCompletionImpl::invalidate()
+{
+    m_spellChecker = 0;
+    m_editorClient = 0;
+}
+
 } // namespace WebKit