Changeset 86017 in webkit
- Timestamp:
- May 7, 2011 5:58:25 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r86016 r86017 1 2011-05-07 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r85974. 4 http://trac.webkit.org/changeset/85974 5 https://bugs.webkit.org/show_bug.cgi?id=60444 6 7 broke browser tests (Requested by inferno-sec on #webkit). 8 9 * platform/network/chromium/ResourceResponse.cpp: 10 (WebCore::ResourceResponse::doPlatformCopyData): 11 (WebCore::ResourceResponse::doPlatformAdopt): 12 * platform/network/chromium/ResourceResponse.h: 13 (WebCore::ResourceResponse::downloadFilePath): 14 (WebCore::ResourceResponse::setDownloadFilePath): 15 1 16 2011-05-07 Jessie Berlin <jberlin@apple.com> 2 17 -
trunk/Source/WebCore/platform/network/chromium/ResourceResponse.cpp
r85974 r86017 41 41 data->m_remoteIPAddress = m_remoteIPAddress; 42 42 data->m_remotePort = m_remotePort; 43 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support m_downloadedFile. 44 ASSERT(!m_downloadedFile); 43 data->m_downloadFilePath = m_downloadFilePath; 45 44 return data; 46 45 } … … 58 57 m_remoteIPAddress = data->m_remoteIPAddress; 59 58 m_remotePort = data->m_remotePort; 60 // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support m_downloadedFile.59 m_downloadFilePath = data->m_downloadFilePath; 61 60 } 62 61 -
trunk/Source/WebCore/platform/network/chromium/ResourceResponse.h
r85974 r86017 28 28 #define ResourceResponse_h 29 29 30 #include "File.h"31 30 #include "NotImplemented.h" 32 31 #include "ResourceResponseBase.h" … … 101 100 void setRemotePort(unsigned short value) { m_remotePort = value; } 102 101 103 const File* downloadedFile() const { return m_downloadedFile.get(); }104 void setDownload edFile(PassRefPtr<File> downloadedFile) { m_downloadedFile = downloadedFile; }102 const String& downloadFilePath() const { return m_downloadFilePath; } 103 void setDownloadFilePath(const String& downloadFilePath) { m_downloadFilePath = downloadFilePath; } 105 104 106 105 private: … … 154 153 unsigned short m_remotePort; 155 154 156 // The downloaded file if the load streamed to afile.157 RefPtr<File> m_downloadedFile;155 // The path to the downloaded file. 156 String m_downloadFilePath; 158 157 }; 159 158 -
trunk/Source/WebKit/chromium/ChangeLog
r85998 r86017 1 2011-05-07 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r85974. 4 http://trac.webkit.org/changeset/85974 5 https://bugs.webkit.org/show_bug.cgi?id=60444 6 7 broke browser tests (Requested by inferno-sec on #webkit). 8 9 * src/WebURLResponse.cpp: 10 (WebKit::WebURLResponse::downloadFilePath): 11 (WebKit::WebURLResponse::setDownloadFilePath): 12 1 13 2011-05-06 Kent Tamura <tkent@chromium.org> 2 14 -
trunk/Source/WebKit/chromium/src/WebURLResponse.cpp
r85974 r86017 366 366 WebString WebURLResponse::downloadFilePath() const 367 367 { 368 const File* downloadedFile = m_private->m_resourceResponse->downloadedFile(); 369 if (downloadedFile) 370 return downloadedFile->path(); 371 return WebString(); 368 return m_private->m_resourceResponse->downloadFilePath(); 372 369 } 373 370 374 371 void WebURLResponse::setDownloadFilePath(const WebString& downloadFilePath) 375 372 { 376 m_private->m_resourceResponse->setDownload edFile(File::create(downloadFilePath));373 m_private->m_resourceResponse->setDownloadFilePath(downloadFilePath.utf8().data()); 377 374 } 378 375
Note: See TracChangeset
for help on using the changeset viewer.