Changeset 70733 in webkit
- Timestamp:
- Oct 27, 2010 5:48:57 PM (13 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r70730 r70733 222 222 (WebKit::WebProcessProxy::canSendMessage): 223 223 The WebProcessProxy can send a message if it is valid or if it is launching. 224 225 2010-10-27 Anders Carlsson <andersca@apple.com> 226 227 Reviewed by Sam Weinig. 228 229 More work on downloads 230 https://bugs.webkit.org/show_bug.cgi?id=48480 231 232 * WebProcess/Downloads/Download.cpp: 233 (WebKit::Download::~Download): 234 Call platformInvalidate(). 235 236 (WebKit::Download::didBegin): 237 (WebKit::Download::didReceiveData): 238 (WebKit::Download::didFinish): 239 Add empty stubs. 240 241 * WebProcess/Downloads/DownloadManager.cpp: 242 (WebKit::DownloadManager::startDownload): 243 Create a Download object and insert it into the m_downloads map. 244 245 * WebProcess/Downloads/cf/DownloadCFNet.cpp: 246 (WebKit::Download::platformInvalidate): 247 Add empty stub. 248 249 * WebProcess/Downloads/mac/DownloadMac.mm: 250 (WebKit::Download::platformInvalidate): 251 Tell the WKDownloadAsDelegate object that we're being invalidated. 252 253 (-[WKDownloadAsDelegate downloadDidBegin:]): 254 Call Download::didBegin. 255 256 (-[WKDownloadAsDelegate download:didReceiveDataOfLength:]): 257 Call Download::didReceiveData. 258 259 (-[WKDownloadAsDelegate downloadDidFinish:]): 260 Call Download::didFinish. 261 262 * WebProcess/Downloads/qt/DownloadQt.cpp: 263 (WebKit::Download::platformInvalidate): 264 Add empty stub. 224 265 225 266 2010-10-27 Anders Carlsson <andersca@apple.com> -
trunk/WebKit2/WebProcess/Downloads/Download.cpp
r70687 r70733 44 44 Download::~Download() 45 45 { 46 platformInvalidate(); 47 } 48 49 void Download::didBegin() 50 { 51 // FIXME: Implement. 52 } 53 54 void Download::didReceiveData(uint64_t length) 55 { 56 // FIXME: Implement. 57 } 58 59 void Download::didFinish() 60 { 61 // FIXME: Implement. 46 62 } 47 63 -
trunk/WebKit2/WebProcess/Downloads/Download.h
r70687 r70733 53 53 void start(); 54 54 55 void didBegin(); 56 void didReceiveData(uint64_t length); 57 void didFinish(); 58 55 59 private: 56 60 Download(uint64_t downloadID, const WebCore::ResourceRequest&); 61 62 void platformInvalidate(); 57 63 58 64 uint64_t m_downloadID; -
trunk/WebKit2/WebProcess/Downloads/DownloadManager.cpp
r70687 r70733 46 46 void DownloadManager::startDownload(uint64_t downloadID, const ResourceRequest& request) 47 47 { 48 // FIXME: Implement. 49 notImplemented(); 48 OwnPtr<Download> download = Download::create(downloadID, request); 49 download->start(); 50 51 ASSERT(!m_downloads.contains(downloadID)); 52 m_downloads.set(downloadID, download.leakPtr()); 50 53 } 51 54 -
trunk/WebKit2/WebProcess/Downloads/DownloadManager.h
r70687 r70733 27 27 #define DownloadManager_h 28 28 29 #include <wtf/HashMap.h> 29 30 #include <wtf/Noncopyable.h> 30 31 … … 34 35 35 36 namespace WebKit { 37 38 class Download; 36 39 37 40 class DownloadManager { … … 46 49 DownloadManager(); 47 50 51 HashMap<uint64_t, Download*> m_downloads; 48 52 }; 49 53 -
trunk/WebKit2/WebProcess/Downloads/cf/DownloadCFNet.cpp
r70687 r70733 37 37 } 38 38 39 void Download::platformInvalidate() 40 { 41 notImplemented(); 42 } 43 39 44 } // namespace WebKit -
trunk/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm
r70687 r70733 49 49 } 50 50 51 void Download::platformInvalidate() 52 { 53 ASSERT(m_nsURLDownload); 54 ASSERT(m_delegate); 55 56 [m_delegate.get() invalidate]; 57 m_delegate = nullptr; 58 m_nsURLDownload = nullptr; 59 } 60 51 61 } // namespace WebKit 52 62 … … 70 80 - (void)downloadDidBegin:(NSURLDownload *)download 71 81 { 72 // FIXME: Implement.73 notImplemented();82 if (_download) 83 _download->didBegin(); 74 84 } 75 85 … … 119 129 - (void)download:(NSURLDownload *)download didReceiveDataOfLength:(NSUInteger)length 120 130 { 121 // FIXME: Implement.122 notImplemented();131 if (_download) 132 _download->didReceiveData(length); 123 133 } 124 134 … … 144 154 - (void)downloadDidFinish:(NSURLDownload *)download 145 155 { 146 // FIXME: Implement.147 notImplemented();156 if (_download) 157 _download->didFinish(); 148 158 } 149 159 -
trunk/WebKit2/WebProcess/Downloads/qt/DownloadQt.cpp
r70687 r70733 37 37 } 38 38 39 void Download::platformInvalidate() 40 { 41 notImplemented(); 42 } 43 39 44 } // namespace WebKit
Note: See TracChangeset
for help on using the changeset viewer.