Changeset 86132 in webkit

Timestamp:

May 10, 2011 12:46:51 AM (13 years ago)

Author:

morrita@google.com

Message:

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

Reviewed by Ryosuke Niwa.

REGRESSION(r73886): Frequent crashes in replaceSelectionWithFragment
​https://bugs.webkit.org/show_bug.cgi?id=60090

SpellChecker uses TextCheckerClient, which belongs Page object,
which is possibly destroyed during SpellChecker's lifetime.
This change added to a guard before using TextCheckerClient to
ensure it being live.

No new tests, this is a speculative fix for a real crash.

• editing/Editor.cpp: (WebCore::Editor::Editor):
• editing/SpellChecker.cpp: (WebCore::SpellChecker::SpellChecker): (WebCore::SpellChecker::client): (WebCore::SpellChecker::canCheckAsynchronously): (WebCore::SpellChecker::requestCheckingFor):
• editing/SpellChecker.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/Editor.cpp (modified) (1 diff)
• editing/SpellChecker.cpp (modified) (5 diffs)
• editing/SpellChecker.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-10  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Ryosuke Niwa.
+
+        REGRESSION(r73886): Frequent crashes in replaceSelectionWithFragment
+        https://bugs.webkit.org/show_bug.cgi?id=60090
+
+        SpellChecker uses TextCheckerClient, which belongs Page object,
+        which is possibly destroyed during SpellChecker's lifetime.
+        This change added to a guard before using TextCheckerClient to
+        ensure it being live.
+        
+        No new tests, this is a speculative fix for a real crash.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::Editor):
+        * editing/SpellChecker.cpp:
+        (WebCore::SpellChecker::SpellChecker):
+        (WebCore::SpellChecker::client):
+        (WebCore::SpellChecker::canCheckAsynchronously):
+        (WebCore::SpellChecker::requestCheckingFor):
+        * editing/SpellChecker.h:
+
 2011-05-09  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -1053 +1053 @@
     , m_shouldStyleWithCSS(false)
     , m_killRing(adoptPtr(new KillRing))
-    , m_spellChecker(adoptPtr(new SpellChecker(frame, frame->page() ? frame->page()->editorClient()->textChecker() : 0)))
+    , m_spellChecker(adoptPtr(new SpellChecker(frame)))
     , m_spellingCorrector(adoptPtr(new SpellingCorrectionController(frame)))
     , m_areMarkedTextMatchesHighlighted(false)

trunk/Source/WebCore/editing/SpellChecker.cpp

@@ -34 +34 @@
 #include "HTMLTextAreaElement.h"
 #include "Node.h"
+#include "Page.h"
 #include "PositionIterator.h"
 #include "Range.h"
@@ -44 +45 @@
 namespace WebCore {
 
-SpellChecker::SpellChecker(Frame* frame, TextCheckerClient* client)
+SpellChecker::SpellChecker(Frame* frame)
     : m_frame(frame)
-    , m_client(client)
     , m_requestSequence(0)
 {
@@ -53 +53 @@
 SpellChecker::~SpellChecker()
 {
+}
+
+TextCheckerClient* SpellChecker::client() const
+{
+    Page* page = m_frame->page();
+    if (!page)
+        return 0;
+    return page->editorClient()->textChecker();
 }
 
@@ -83 +91 @@
 bool SpellChecker::canCheckAsynchronously(Node* node) const
 {
-    return isCheckable(node) && isAsynchronousEnabled() && !isBusy();
+    return client() && isCheckable(node) && isAsynchronousEnabled() && !isBusy();
 }
 
@@ -107 +115 @@
     if (!initRequest(node))
         return;
-    m_client->requestCheckingOfString(this, m_requestSequence, mask, m_requestText);
+    client()->requestCheckingOfString(this, m_requestSequence, mask, m_requestText);
 }
 

trunk/Source/WebCore/editing/SpellChecker.h

@@ -40 +40 @@
     WTF_MAKE_NONCOPYABLE(SpellChecker);
 public:
-    explicit SpellChecker(Frame*, TextCheckerClient*);
+    explicit SpellChecker(Frame*);
     ~SpellChecker();
 
@@ -54 +54 @@
     bool initRequest(Node*);
     void clearRequest();
+    TextCheckerClient* client() const;
 
     Frame* m_frame;
-    TextCheckerClient* m_client;
 
     RefPtr<Node> m_requestNode;