Changeset 70733 in webkit

Timestamp:

Oct 27, 2010 5:48:57 PM (13 years ago)

Author:

andersca@apple.com

Message:

More work on downloads
​https://bugs.webkit.org/show_bug.cgi?id=48480

Reviewed by Sam Weinig.

• WebProcess/Downloads/Download.cpp:

(WebKit::Download::~Download):
Call platformInvalidate().

(WebKit::Download::didBegin):
(WebKit::Download::didReceiveData):
(WebKit::Download::didFinish):
Add empty stubs.

• WebProcess/Downloads/DownloadManager.cpp:

(WebKit::DownloadManager::startDownload):
Create a Download object and insert it into the m_downloads map.

• WebProcess/Downloads/cf/DownloadCFNet.cpp:

(WebKit::Download::platformInvalidate):
Add empty stub.

• WebProcess/Downloads/mac/DownloadMac.mm:

(WebKit::Download::platformInvalidate):
Tell the WKDownloadAsDelegate object that we're being invalidated.

(-[WKDownloadAsDelegate downloadDidBegin:]):
Call Download::didBegin.

(-[WKDownloadAsDelegate download:didReceiveDataOfLength:]):
Call Download::didReceiveData.

(-[WKDownloadAsDelegate downloadDidFinish:]):
Call Download::didFinish.

• WebProcess/Downloads/qt/DownloadQt.cpp:

(WebKit::Download::platformInvalidate):
Add empty stub.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Downloads/Download.cpp (modified) (1 diff)
• WebProcess/Downloads/Download.h (modified) (1 diff)
• WebProcess/Downloads/DownloadManager.cpp (modified) (1 diff)
• WebProcess/Downloads/DownloadManager.h (modified) (3 diffs)
• WebProcess/Downloads/cf/DownloadCFNet.cpp (modified) (1 diff)
• WebProcess/Downloads/mac/DownloadMac.mm (modified) (4 diffs)
• WebProcess/Downloads/qt/DownloadQt.cpp (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ -222 +222 @@
         (WebKit::WebProcessProxy::canSendMessage):
         The WebProcessProxy can send a message if it is valid or if it is launching.
+
+2010-10-27  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        More work on downloads
+        https://bugs.webkit.org/show_bug.cgi?id=48480
+
+        * WebProcess/Downloads/Download.cpp:
+        (WebKit::Download::~Download):
+        Call platformInvalidate().
+
+        (WebKit::Download::didBegin):
+        (WebKit::Download::didReceiveData):
+        (WebKit::Download::didFinish):
+        Add empty stubs.
+
+        * WebProcess/Downloads/DownloadManager.cpp:
+        (WebKit::DownloadManager::startDownload):
+        Create a Download object and insert it into the m_downloads map.
+
+        * WebProcess/Downloads/cf/DownloadCFNet.cpp:
+        (WebKit::Download::platformInvalidate):
+        Add empty stub.
+        
+        * WebProcess/Downloads/mac/DownloadMac.mm:
+        (WebKit::Download::platformInvalidate):
+        Tell the WKDownloadAsDelegate object that we're being invalidated.
+
+        (-[WKDownloadAsDelegate downloadDidBegin:]):
+        Call Download::didBegin.
+
+        (-[WKDownloadAsDelegate download:didReceiveDataOfLength:]):
+        Call Download::didReceiveData.
+
+        (-[WKDownloadAsDelegate downloadDidFinish:]):
+        Call Download::didFinish.
+
+        * WebProcess/Downloads/qt/DownloadQt.cpp:
+        (WebKit::Download::platformInvalidate):
+        Add empty stub.
 
 2010-10-27  Anders Carlsson  <andersca@apple.com>

trunk/WebKit2/WebProcess/Downloads/Download.cpp

@@ -44 +44 @@
 Download::~Download()
 {
+    platformInvalidate();
+}
+
+void Download::didBegin()
+{
+    // FIXME: Implement.
+}
+
+void Download::didReceiveData(uint64_t length)
+{
+    // FIXME: Implement.
+}
+
+void Download::didFinish()
+{
+    // FIXME: Implement.
 }
 

trunk/WebKit2/WebProcess/Downloads/Download.h

@@ -53 +53 @@
     void start();
 
+    void didBegin();
+    void didReceiveData(uint64_t length);
+    void didFinish();
+
 private:
     Download(uint64_t downloadID, const WebCore::ResourceRequest&);
+
+    void platformInvalidate();
 
     uint64_t m_downloadID;

trunk/WebKit2/WebProcess/Downloads/DownloadManager.cpp

@@ -46 +46 @@
 void DownloadManager::startDownload(uint64_t downloadID, const ResourceRequest& request)
 {
-    // FIXME: Implement.
-    notImplemented();
+    OwnPtr<Download> download = Download::create(downloadID, request);
+    download->start();
+
+    ASSERT(!m_downloads.contains(downloadID));
+    m_downloads.set(downloadID, download.leakPtr());
 }
 

trunk/WebKit2/WebProcess/Downloads/DownloadManager.h

@@ -27 +27 @@
 #define DownloadManager_h
 
+#include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
 
@@ -34 +35 @@
 
 namespace WebKit {
+
+class Download;
 
 class DownloadManager {
@@ -46 +49 @@
     DownloadManager();
 
+    HashMap<uint64_t, Download*> m_downloads;
 };
 

trunk/WebKit2/WebProcess/Downloads/cf/DownloadCFNet.cpp

@@ -37 +37 @@
 }
 
+void Download::platformInvalidate()
+{
+    notImplemented();
+}
+
 } // namespace WebKit

trunk/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm

@@ -49 +49 @@
 }
 
+void Download::platformInvalidate()
+{
+    ASSERT(m_nsURLDownload);
+    ASSERT(m_delegate);
+
+    [m_delegate.get() invalidate];
+    m_delegate = nullptr;
+    m_nsURLDownload = nullptr;
+}
+
 } // namespace WebKit
 
@@ -70 +80 @@
 - (void)downloadDidBegin:(NSURLDownload *)download
 {
-    // FIXME: Implement.
-    notImplemented();
+    if (_download)
+        _download->didBegin();
 }
 
@@ -119 +129 @@
 - (void)download:(NSURLDownload *)download didReceiveDataOfLength:(NSUInteger)length
 {
-    // FIXME: Implement.
-    notImplemented();
+    if (_download)
+        _download->didReceiveData(length);
 }
 
@@ -144 +154 @@
 - (void)downloadDidFinish:(NSURLDownload *)download
 {
-    // FIXME: Implement.
-    notImplemented();
+    if (_download)
+        _download->didFinish();
 }
 

trunk/WebKit2/WebProcess/Downloads/qt/DownloadQt.cpp

@@ -37 +37 @@
 }
 
+void Download::platformInvalidate()
+{
+    notImplemented();
+}
+
 } // namespace WebKit