1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebKit/chromium/src/EditorClientImpl.cpp b/Source/WebKit/chromium/src/EditorClientImpl.cpp
index 8d4774dbe..c004c3fc3 100644
--- a/Source/WebKit/chromium/src/EditorClientImpl.cpp
+++ b/Source/WebKit/chromium/src/EditorClientImpl.cpp
@@ -180,7 +180,8 @@ void EditorClientImpl::toggleContinuousSpellChecking()
 
 bool EditorClientImpl::isGrammarCheckingEnabled()
 {
-    return false;
+    const Frame* frame = m_webView->focusedWebCoreFrame();
+    return frame && frame->settings() && frame->settings()->asynchronousSpellCheckingEnabled();
 }
 
 void EditorClientImpl::toggleGrammarChecking()
@@ -790,7 +791,7 @@ void EditorClientImpl::checkGrammarOfString(const UChar*, int length,
 {
     notImplemented();
     if (badGrammarLocation)
-        *badGrammarLocation = 0;
+        *badGrammarLocation = -1;
     if (badGrammarLength)
         *badGrammarLength = 0;
 }