Changeset 70346 in webkit

Timestamp:

Oct 22, 2010 2:47:22 PM (14 years ago)

Author:

jberlin@webkit.org

Message:

Crash in Connection::isValid when called in response to
VisitedLinksProvider::pendingVisitedLinksTimerFired after WebProcessProxy::didClose was
already called.
​https://bugs.webkit.org/show_bug.cgi?id=48153

Reviewed by Anders Carlsson.

• UIProcess/VisitedLinkProvider.cpp:

(WebKit::VisitedLinkProvider::stopVisitedLinksTimer):

• UIProcess/VisitedLinkProvider.h:

• UIProcess/WebContext.cpp:

(WebKit::WebContext::processDidClose):
Stop the pendingVisitedLinksTimer and null out the process.

• UIProcess/WebContext.h:

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::didClose):
Tell the WebContext that the WebProcess did close.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/VisitedLinkProvider.cpp (modified) (1 diff)
• UIProcess/VisitedLinkProvider.h (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (1 diff)
• UIProcess/WebContext.h (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-22  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Crash in Connection::isValid when called in response to
+        VisitedLinksProvider::pendingVisitedLinksTimerFired after WebProcessProxy::didClose was
+        already called.
+        https://bugs.webkit.org/show_bug.cgi?id=48153
+
+        * UIProcess/VisitedLinkProvider.cpp:
+        (WebKit::VisitedLinkProvider::stopVisitedLinksTimer):
+        * UIProcess/VisitedLinkProvider.h:
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::processDidClose):
+        Stop the pendingVisitedLinksTimer and null out the process.
+        * UIProcess/WebContext.h:
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::didClose):
+        Tell the WebContext that the WebProcess did close.
+
 2010-10-22  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/UIProcess/VisitedLinkProvider.cpp

@@ -62 +62 @@
     if (!m_pendingVisitedLinksTimer.isActive())
         m_pendingVisitedLinksTimer.startOneShot(0);
+}
+
+void VisitedLinkProvider::stopVisitedLinksTimer()
+{
+    m_pendingVisitedLinksTimer.stop();
 }
 

trunk/WebKit2/UIProcess/VisitedLinkProvider.h

@@ -45 +45 @@
     void addVisitedLink(WebCore::LinkHash);
 
+    void stopVisitedLinksTimer();
+
 private:
     void pendingVisitedLinksTimerFired();

trunk/WebKit2/UIProcess/WebContext.cpp

@@ -195 +195 @@
 }
 
+void WebContext::processDidClose(WebProcessProxy* process)
+{
+    // FIXME: Once we support multiple processes per context, this assertion won't hold.
+    ASSERT(process == m_process);
+
+    m_visitedLinkProvider.stopVisitedLinksTimer();
+
+    m_process = 0;
+}
+
 WebPageProxy* WebContext::createWebPage(WebPageNamespace* pageNamespace)
 {

trunk/WebKit2/UIProcess/WebContext.h

@@ -69 +69 @@
 
     void processDidFinishLaunching(WebProcessProxy*);
+    void processDidClose(WebProcessProxy*);
 
     WebPageProxy* createWebPage(WebPageNamespace*);

trunk/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -415 +415 @@
         pages[i]->processDidCrash();
 
+    m_context->processDidClose(this);
+
     // This may cause us to be deleted.
     WebProcessManager::shared().processDidClose(this, m_context);