Changeset 85974 in webkit

Timestamp:

May 6, 2011 1:52:53 PM (13 years ago)

Author:

brettw@chromium.org

Message:

2011-05-06 Brett Wilson <​brettw@chromium.org>

Reviewed by Adam Barth.

Use a File object to store the downloaded file reference rather than
just the path. This keeps the file and permissions in scope (using the
already-existing blob system) so the browser won't delete the file
when the load is complete. Instead, the file will be cleaned up when
the request objects are deleted.
​https://bugs.webkit.org/show_bug.cgi?id=60281

• platform/network/chromium/ResourceResponse.cpp: (WebCore::ResourceResponse::doPlatformCopyData): (WebCore::ResourceResponse::doPlatformAdopt):
• platform/network/chromium/ResourceResponse.h: (WebCore::ResourceResponse::downloadedFile): (WebCore::ResourceResponse::setDownloadedFile):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/chromium/ResourceResponse.cpp (modified) (2 diffs)
• WebCore/platform/network/chromium/ResourceResponse.h (modified) (3 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebURLResponse.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-06  Brett Wilson  <brettw@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Use a File object to store the downloaded file reference rather than
+        just the path. This keeps the file and permissions in scope (using the
+        already-existing blob system) so the browser won't delete the file
+        when the load is complete. Instead, the file will be cleaned up when
+        the request objects are deleted.
+        https://bugs.webkit.org/show_bug.cgi?id=60281
+
+        * platform/network/chromium/ResourceResponse.cpp:
+        (WebCore::ResourceResponse::doPlatformCopyData):
+        (WebCore::ResourceResponse::doPlatformAdopt):
+        * platform/network/chromium/ResourceResponse.h:
+        (WebCore::ResourceResponse::downloadedFile):
+        (WebCore::ResourceResponse::setDownloadedFile):
+
 2011-05-06  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebCore/platform/network/chromium/ResourceResponse.cpp

@@ -41 +41 @@
     data->m_remoteIPAddress = m_remoteIPAddress;
     data->m_remotePort = m_remotePort;
-    data->m_downloadFilePath = m_downloadFilePath;
+    // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support m_downloadedFile.
+    ASSERT(!m_downloadedFile);
     return data;
 }
@@ -57 +58 @@
     m_remoteIPAddress = data->m_remoteIPAddress;
     m_remotePort = data->m_remotePort;
-    m_downloadFilePath = data->m_downloadFilePath;
+    // Bug https://bugs.webkit.org/show_bug.cgi?id=60397 this doesn't support m_downloadedFile.
 }
 

trunk/Source/WebCore/platform/network/chromium/ResourceResponse.h

@@ -28 +28 @@
 #define ResourceResponse_h
 
+#include "File.h"
 #include "NotImplemented.h"
 #include "ResourceResponseBase.h"
@@ -100 +101 @@
         void setRemotePort(unsigned short value) { m_remotePort = value; }
 
-        const String& downloadFilePath() const { return m_downloadFilePath; }
-        void setDownloadFilePath(const String& downloadFilePath) { m_downloadFilePath = downloadFilePath; }
+        const File* downloadedFile() const { return m_downloadedFile.get(); }
+        void setDownloadedFile(PassRefPtr<File> downloadedFile) { m_downloadedFile = downloadedFile; }
 
     private:
@@ -153 +154 @@
         unsigned short m_remotePort;
 
-        // The path to the downloaded file.
-        String m_downloadFilePath;
+        // The downloaded file if the load streamed to a file.
+        RefPtr<File> m_downloadedFile;
     };
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-05-06  Brett Wilson  <brettw@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Use a File object to store the downloaded file reference rather than
+        just the path. This keeps the file and permissions in scope (using the
+        already-existing blob system) so the browser won't delete the file
+        when the load is complete. Instead, the file will be cleaned up when
+        the request objects are deleted.
+        https://bugs.webkit.org/show_bug.cgi?id=60281
+
+        * src/WebURLResponse.cpp:
+        (WebKit::WebURLResponse::downloadFilePath):
+        (WebKit::WebURLResponse::setDownloadFilePath):
+
 2011-05-06  John Abd-El-Malek  <jam@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebURLResponse.cpp

@@ -366 +366 @@
 WebString WebURLResponse::downloadFilePath() const
 {
-    return m_private->m_resourceResponse->downloadFilePath();
+    const File* downloadedFile = m_private->m_resourceResponse->downloadedFile();
+    if (downloadedFile)
+        return downloadedFile->path();
+    return WebString();
 }
 
 void WebURLResponse::setDownloadFilePath(const WebString& downloadFilePath)
 {
-    m_private->m_resourceResponse->setDownloadFilePath(downloadFilePath.utf8().data());
+    m_private->m_resourceResponse->setDownloadedFile(File::create(downloadFilePath));
 }