Title: [137807] trunk/Source/WebKit2
- Revision
- 137807
- Author
- [email protected]
- Date
- 2012-12-15 13:15:29 -0800 (Sat, 15 Dec 2012)
Log Message
DownloadProxy objects should know which DownloadProxyMap they belong to
https://bugs.webkit.org/show_bug.cgi?id=105102
Reviewed by Andy Estes.
* UIProcess/Downloads/DownloadProxy.cpp:
(WebKit::DownloadProxy::create):
(WebKit::DownloadProxy::DownloadProxy):
* UIProcess/Downloads/DownloadProxy.h:
(WebKit):
(DownloadProxy):
* UIProcess/Downloads/DownloadProxyMap.cpp:
(WebKit::DownloadProxyMap::createDownloadProxy):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (137806 => 137807)
--- trunk/Source/WebKit2/ChangeLog 2012-12-15 21:08:46 UTC (rev 137806)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-15 21:15:29 UTC (rev 137807)
@@ -1,3 +1,19 @@
+2012-12-15 Anders Carlsson <[email protected]>
+
+ DownloadProxy objects should know which DownloadProxyMap they belong to
+ https://bugs.webkit.org/show_bug.cgi?id=105102
+
+ Reviewed by Andy Estes.
+
+ * UIProcess/Downloads/DownloadProxy.cpp:
+ (WebKit::DownloadProxy::create):
+ (WebKit::DownloadProxy::DownloadProxy):
+ * UIProcess/Downloads/DownloadProxy.h:
+ (WebKit):
+ (DownloadProxy):
+ * UIProcess/Downloads/DownloadProxyMap.cpp:
+ (WebKit::DownloadProxyMap::createDownloadProxy):
+
2012-12-15 Andy Estes <[email protected]>
[WebKit2] Move CustomProtocolManager to Shared/
Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp (137806 => 137807)
--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2012-12-15 21:08:46 UTC (rev 137806)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2012-12-15 21:15:29 UTC (rev 137807)
@@ -45,13 +45,14 @@
return ++uniqueDownloadID;
}
-PassRefPtr<DownloadProxy> DownloadProxy::create(WebContext* webContext)
+PassRefPtr<DownloadProxy> DownloadProxy::create(DownloadProxyMap& downloadProxyMap, WebContext* webContext)
{
- return adoptRef(new DownloadProxy(webContext));
+ return adoptRef(new DownloadProxy(downloadProxyMap, webContext));
}
-DownloadProxy::DownloadProxy(WebContext* webContext)
- : m_webContext(webContext)
+DownloadProxy::DownloadProxy(DownloadProxyMap& downloadProxyMap, WebContext* webContext)
+ : m_downloadProxyMap(downloadProxyMap)
+ , m_webContext(webContext)
, m_downloadID(generateDownloadID())
{
}
Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h (137806 => 137807)
--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h 2012-12-15 21:08:46 UTC (rev 137806)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h 2012-12-15 21:15:29 UTC (rev 137807)
@@ -41,6 +41,7 @@
namespace WebKit {
+class DownloadProxyMap;
class WebContext;
class WebData;
class WebPageProxy;
@@ -49,7 +50,7 @@
public:
static const Type APIType = TypeDownload;
- static PassRefPtr<DownloadProxy> create(WebContext*);
+ static PassRefPtr<DownloadProxy> create(DownloadProxyMap&, WebContext*);
~DownloadProxy();
uint64_t downloadID() const { return m_downloadID; }
@@ -69,7 +70,7 @@
#endif
private:
- explicit DownloadProxy(WebContext*);
+ explicit DownloadProxy(DownloadProxyMap&, WebContext*);
virtual Type type() const { return APIType; }
@@ -89,6 +90,7 @@
void didFail(const WebCore::ResourceError&, const CoreIPC::DataReference& resumeData);
void didCancel(const CoreIPC::DataReference& resumeData);
+ DownloadProxyMap& m_downloadProxyMap;
WebContext* m_webContext;
uint64_t m_downloadID;
Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp (137806 => 137807)
--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp 2012-12-15 21:08:46 UTC (rev 137806)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp 2012-12-15 21:15:29 UTC (rev 137807)
@@ -42,7 +42,7 @@
DownloadProxy* DownloadProxyMap::createDownloadProxy(WebContext* webContext)
{
- RefPtr<DownloadProxy> downloadProxy = DownloadProxy::create(webContext);
+ RefPtr<DownloadProxy> downloadProxy = DownloadProxy::create(*this, webContext);
m_downloads.set(downloadProxy->downloadID(), downloadProxy);
return downloadProxy.get();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
