Compute ResourceResponse::suggestedFileName on the fly.

third_party/WebKit/Source/platform/network/ResourceResponse.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 92 matching lines @@
 
 ResourceResponse::ResourceResponse(const KURL& url,
                                    const AtomicString& mimeType,
                                    long long expectedLength,
                                    const AtomicString& textEncodingName,
                                    const String& filename)
     : m_url(url),
       m_mimeType(mimeType),
       m_expectedContentLength(expectedLength),
       m_textEncodingName(textEncodingName),
-      m_suggestedFilename(filename),
       m_httpStatusCode(0),
       m_lastModifiedDate(0),
       m_wasCached(false),
       m_connectionID(0),
       m_connectionReused(false),
       m_isNull(false),
       m_haveParsedAgeHeader(false),
       m_haveParsedDateHeader(false),
       m_haveParsedExpiresHeader(false),
       m_haveParsedLastModifiedHeader(false),
@@ skipping 18 matching lines @@
       m_encodedDataLength(0),
       m_encodedBodyLength(0),
       m_decodedBodyLength(0) {}
 
 ResourceResponse::ResourceResponse(CrossThreadResourceResponseData* data)
     : ResourceResponse() {
   setURL(data->m_url);
   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));
 
   m_httpHeaderFields.adopt(std::move(data->m_httpHeaders));
   setLastModifiedDate(data->m_lastModifiedDate);
   setResourceLoadTiming(data->m_resourceLoadTiming.release());
   m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors;
   m_securityStyle = data->m_securityStyle;
   m_securityDetails.protocol = data->m_securityDetails.protocol;
@@ skipping 42 matching lines @@
     default;
 
 std::unique_ptr<CrossThreadResourceResponseData> ResourceResponse::copyData()
     const {
   std::unique_ptr<CrossThreadResourceResponseData> data =
       wrapUnique(new CrossThreadResourceResponseData);
   data->m_url = url().copy();
   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();
   data->m_lastModifiedDate = lastModifiedDate();
   if (m_resourceLoadTiming)
     data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy();
   data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors;
   data->m_securityStyle = m_securityStyle;
   data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy();
   data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy();
@@ skipping 86 matching lines @@
 }
 
 void ResourceResponse::setTextEncodingName(const AtomicString& encodingName) {
   m_isNull = false;
 
   // FIXME: Text encoding is determined by HTTP Content-Type header. We should
   // update the header, so that it doesn't disagree with m_textEncodingName.
   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;
 }
 
 void ResourceResponse::setHTTPStatusCode(int statusCode) {
   m_httpStatusCode = statusCode;
 }
 
 const AtomicString& ResourceResponse::httpStatusText() const {
   return m_httpStatusText;
@@ skipping 288 matching lines @@
   if (a.isNull() != b.isNull())
     return false;
   if (a.url() != b.url())
     return false;
   if (a.mimeType() != b.mimeType())
     return false;
   if (a.expectedContentLength() != b.expectedContentLength())
     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())
     return false;
   if (a.httpHeaderFields() != b.httpHeaderFields())
     return false;
   if (a.resourceLoadTiming() && b.resourceLoadTiming() &&
       *a.resourceLoadTiming() == *b.resourceLoadTiming())
     return true;
   if (a.resourceLoadTiming() != b.resourceLoadTiming())
     return false;
   if (a.encodedBodyLength() != b.encodedBodyLength())
     return false;
   if (a.decodedBodyLength() != b.decodedBodyLength())
     return false;
   return true;
 }
 
 }  // namespace blink