Changeset 137810 in webkit

Timestamp:

Dec 15, 2012, 2:04:12 PM (13 years ago)

Author:

andersca@apple.com

Message:

DownloadProxy should keep a strong reference to its associated web context
​https://bugs.webkit.org/show_bug.cgi?id=105107

Reviewed by Alexey Proskuryakov.

While this does create a ref-cycle, it's broken when the download completes, fails, is canceled or
if the process that's doing the download crashes.

• UIProcess/Downloads/DownloadProxy.cpp:

(WebKit::DownloadProxy::processDidClose):
(WebKit::DownloadProxy::didStart):
(WebKit::DownloadProxy::didReceiveAuthenticationChallenge):
(WebKit::DownloadProxy::didReceiveResponse):
(WebKit::DownloadProxy::didReceiveData):
(WebKit::DownloadProxy::shouldDecodeSourceDataOfMIMEType):
(WebKit::DownloadProxy::decideDestinationWithSuggestedFilename):
(WebKit::DownloadProxy::didCreateDestination):
(WebKit::DownloadProxy::didFinish):
(WebKit::DownloadProxy::didFail):
(WebKit::DownloadProxy::didCancel):

• UIProcess/Downloads/DownloadProxy.h:

(DownloadProxy):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Downloads/DownloadProxy.cpp (modified) (11 diffs)
• UIProcess/Downloads/DownloadProxy.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-12-15  Anders Carlsson  <andersca@apple.com>
+
+        DownloadProxy should keep a strong reference to its associated web context
+        https://bugs.webkit.org/show_bug.cgi?id=105107
+
+        Reviewed by Alexey Proskuryakov.
+
+        While this does create a ref-cycle, it's broken when the download completes, fails, is canceled or
+        if the process that's doing the download crashes.
+
+        * UIProcess/Downloads/DownloadProxy.cpp:
+        (WebKit::DownloadProxy::processDidClose):
+        (WebKit::DownloadProxy::didStart):
+        (WebKit::DownloadProxy::didReceiveAuthenticationChallenge):
+        (WebKit::DownloadProxy::didReceiveResponse):
+        (WebKit::DownloadProxy::didReceiveData):
+        (WebKit::DownloadProxy::shouldDecodeSourceDataOfMIMEType):
+        (WebKit::DownloadProxy::decideDestinationWithSuggestedFilename):
+        (WebKit::DownloadProxy::didCreateDestination):
+        (WebKit::DownloadProxy::didFinish):
+        (WebKit::DownloadProxy::didFail):
+        (WebKit::DownloadProxy::didCancel):
+        * UIProcess/Downloads/DownloadProxy.h:
+        (DownloadProxy):
+
 2012-12-15  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp

@@ -83 +83 @@
         return;
 
-    m_webContext->downloadClient().processDidCrash(m_webContext, this);
+    m_webContext->downloadClient().processDidCrash(m_webContext.get(), this);
 }
 
@@ -103 +103 @@
         return;
 
-    m_webContext->downloadClient().didStart(m_webContext, this);
+    m_webContext->downloadClient().didStart(m_webContext.get(), this);
 }
 
@@ -114 +114 @@
     // Once this is fixed, remove WebContext::deprecatedSharedProcess().
     RefPtr<AuthenticationChallengeProxy> authenticationChallengeProxy = AuthenticationChallengeProxy::create(authenticationChallenge, challengeID, m_webContext->deprecatedSharedProcess());
-    m_webContext->downloadClient().didReceiveAuthenticationChallenge(m_webContext, this, authenticationChallengeProxy.get());
+    m_webContext->downloadClient().didReceiveAuthenticationChallenge(m_webContext.get(), this, authenticationChallengeProxy.get());
 }
 
@@ -122 +122 @@
         return;
 
-    m_webContext->downloadClient().didReceiveResponse(m_webContext, this, response);
+    m_webContext->downloadClient().didReceiveResponse(m_webContext.get(), this, response);
 }
 
@@ -130 +130 @@
         return;
 
-    m_webContext->downloadClient().didReceiveData(m_webContext, this, length);
+    m_webContext->downloadClient().didReceiveData(m_webContext.get(), this, length);
 }
 
@@ -138 +138 @@
         return;
 
-    result = m_webContext->downloadClient().shouldDecodeSourceDataOfMIMEType(m_webContext, this, mimeType);
+    result = m_webContext->downloadClient().shouldDecodeSourceDataOfMIMEType(m_webContext.get(), this, mimeType);
 }
 
@@ -146 +146 @@
         return;
 
-    destination = m_webContext->downloadClient().decideDestinationWithSuggestedFilename(m_webContext, this, filename, allowOverwrite);
+    destination = m_webContext->downloadClient().decideDestinationWithSuggestedFilename(m_webContext.get(), this, filename, allowOverwrite);
 
     if (!destination.isNull())
@@ -157 +157 @@
         return;
 
-    m_webContext->downloadClient().didCreateDestination(m_webContext, this, path);
+    m_webContext->downloadClient().didCreateDestination(m_webContext.get(), this, path);
 }
 
@@ -165 +165 @@
         return;
 
-    m_webContext->downloadClient().didFinish(m_webContext, this);
+    m_webContext->downloadClient().didFinish(m_webContext.get(), this);
 
     // This can cause the DownloadProxy object to be deleted.
@@ -186 +186 @@
     m_resumeData = createWebData(resumeData);
 
-    m_webContext->downloadClient().didFail(m_webContext, this, error);
+    m_webContext->downloadClient().didFail(m_webContext.get(), this, error);
 
     // This can cause the DownloadProxy object to be deleted.
@@ -196 +196 @@
     m_resumeData = createWebData(resumeData);
 
-    m_webContext->downloadClient().didCancel(m_webContext, this);
+    m_webContext->downloadClient().didCancel(m_webContext.get(), this);
 
     // This can cause the DownloadProxy object to be deleted.

trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h

@@ -92 +92 @@
 
     DownloadProxyMap& m_downloadProxyMap;
-    WebContext* m_webContext;
+    RefPtr<WebContext> m_webContext;
     uint64_t m_downloadID;