Changeset 86017 in webkit

Timestamp:

May 7, 2011 5:58:25 PM (13 years ago)

Author:

inferno@chromium.org

Message:

2011-05-07 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r85974.
​http://trac.webkit.org/changeset/85974
​https://bugs.webkit.org/show_bug.cgi?id=60444

broke browser tests (Requested by inferno-sec on #webkit).

• src/WebURLResponse.cpp: (WebKit::WebURLResponse::downloadFilePath): (WebKit::WebURLResponse::setDownloadFilePath):

2011-05-07 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r85974.
​http://trac.webkit.org/changeset/85974
​https://bugs.webkit.org/show_bug.cgi?id=60444

broke browser tests (Requested by inferno-sec on #webkit).

• platform/network/chromium/ResourceResponse.cpp: (WebCore::ResourceResponse::doPlatformCopyData): (WebCore::ResourceResponse::doPlatformAdopt):
• platform/network/chromium/ResourceResponse.h: (WebCore::ResourceResponse::downloadFilePath): (WebCore::ResourceResponse::setDownloadFilePath):

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-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r85974.
+        http://trac.webkit.org/changeset/85974
+        https://bugs.webkit.org/show_bug.cgi?id=60444
+
+        broke browser tests (Requested by inferno-sec on #webkit).
+
+        * platform/network/chromium/ResourceResponse.cpp:
+        (WebCore::ResourceResponse::doPlatformCopyData):
+        (WebCore::ResourceResponse::doPlatformAdopt):
+        * platform/network/chromium/ResourceResponse.h:
+        (WebCore::ResourceResponse::downloadFilePath):
+        (WebCore::ResourceResponse::setDownloadFilePath):
+
 2011-05-07  Jessie Berlin  <jberlin@apple.com>
 

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

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

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

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

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-05-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r85974.
+        http://trac.webkit.org/changeset/85974
+        https://bugs.webkit.org/show_bug.cgi?id=60444
+
+        broke browser tests (Requested by inferno-sec on #webkit).
+
+        * src/WebURLResponse.cpp:
+        (WebKit::WebURLResponse::downloadFilePath):
+        (WebKit::WebURLResponse::setDownloadFilePath):
+
 2011-05-06  Kent Tamura  <tkent@chromium.org>
 

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

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