Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1457)

Unified Diff: third_party/WebKit/Source/platform/network/ResourceResponse.cpp

Issue 2674953003: Only generate suggested filenames when actually dragging an image. (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/network/ResourceResponse.cpp
diff --git a/third_party/WebKit/Source/platform/network/ResourceResponse.cpp b/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
index d627853a28fda4a6200af9f7c8838f6ad94578bf..79b9a01b33defeb70725e1d289a458253c18b3f8 100644
--- a/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
+++ b/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
@@ -26,9 +26,11 @@
#include "platform/network/ResourceResponse.h"
+#include "platform/HTTPNames.h"
#include "wtf/CurrentTime.h"
#include "wtf/PtrUtil.h"
#include "wtf/StdLibExtras.h"
+
#include <memory>
namespace blink {
@@ -108,13 +110,11 @@ ResourceResponse::ResourceResponse()
ResourceResponse::ResourceResponse(const KURL& url,
const AtomicString& mimeType,
long long expectedLength,
- const AtomicString& textEncodingName,
- const String& filename)
+ const AtomicString& textEncodingName)
: m_url(url),
m_mimeType(mimeType),
m_expectedContentLength(expectedLength),
m_textEncodingName(textEncodingName),
- m_suggestedFilename(filename),
m_httpStatusCode(0),
m_lastModifiedDate(0),
m_wasCached(false),
@@ -154,7 +154,6 @@ ResourceResponse::ResourceResponse(CrossThreadResourceResponseData* data)
setMimeType(AtomicString(data->m_mimeType));
setExpectedContentLength(data->m_expectedContentLength);
setTextEncodingName(AtomicString(data->m_textEncodingName));
- setSuggestedFilename(data->m_suggestedFilename);
setHTTPStatusCode(data->m_httpStatusCode);
setHTTPStatusText(AtomicString(data->m_httpStatusText));
@@ -219,7 +218,6 @@ std::unique_ptr<CrossThreadResourceResponseData> ResourceResponse::copyData()
data->m_mimeType = mimeType().getString().isolatedCopy();
data->m_expectedContentLength = expectedContentLength();
data->m_textEncodingName = textEncodingName().getString().isolatedCopy();
- data->m_suggestedFilename = suggestedFilename().isolatedCopy();
data->m_httpStatusCode = httpStatusCode();
data->m_httpStatusText = httpStatusText().getString().isolatedCopy();
data->m_httpHeaders = httpHeaderFields().copyData();
@@ -332,19 +330,6 @@ void ResourceResponse::setTextEncodingName(const AtomicString& encodingName) {
m_textEncodingName = encodingName;
}
-// FIXME should compute this on the fly
-const String& ResourceResponse::suggestedFilename() const {
- return m_suggestedFilename;
-}
-
-void ResourceResponse::setSuggestedFilename(const String& suggestedName) {
- m_isNull = false;
-
- // FIXME: Suggested file name is calculated based on other headers. There
- // should not be a setter for it.
- m_suggestedFilename = suggestedName;
-}
-
int ResourceResponse::httpStatusCode() const {
return m_httpStatusCode;
}
@@ -544,9 +529,8 @@ double ResourceResponse::lastModified() const {
}
bool ResourceResponse::isAttachment() const {
- static const char headerName[] = "content-disposition";
static const char attachmentString[] = "attachment";
- String value = m_httpHeaderFields.get(headerName);
+ String value = m_httpHeaderFields.get(HTTPNames::Content_Disposition);
size_t loc = value.find(';');
if (loc != kNotFound)
value = value.left(loc);
@@ -652,8 +636,6 @@ bool ResourceResponse::compare(const ResourceResponse& a,
return false;
if (a.textEncodingName() != b.textEncodingName())
return false;
- if (a.suggestedFilename() != b.suggestedFilename())
- return false;
if (a.httpStatusCode() != b.httpStatusCode())
return false;
if (a.httpStatusText() != b.httpStatusText())
« no previous file with comments | « third_party/WebKit/Source/platform/network/ResourceResponse.h ('k') | third_party/WebKit/public/platform/WebDragData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698