Changeset 168201 in webkit

Timestamp:

May 2, 2014, 3:41:24 PM (11 years ago)

Author:

ap@apple.com

Message:

Remove Blob contentDisposition handling
​https://bugs.webkit.org/show_bug.cgi?id=132490

Reviewed by Sam Weinig.

Source/WebCore:
Dead code.

• platform/network/BlobData.h:

(WebCore::BlobData::contentDisposition): Deleted.
(WebCore::BlobData::setContentDisposition): Deleted.

• platform/network/BlobRegistryImpl.cpp:

(WebCore::BlobRegistryImpl::registerBlobURL):
(WebCore::BlobRegistryImpl::registerBlobURLForSlice):

• platform/network/BlobResourceHandle.cpp:

(WebCore::BlobResourceHandle::notifyResponseOnSuccess):

• platform/network/BlobStorageData.h:

(WebCore::BlobStorageData::create):
(WebCore::BlobStorageData::contentType):
(WebCore::BlobStorageData::BlobStorageData):
(WebCore::BlobStorageData::contentDisposition): Deleted.

Source/WebKit2:

• Shared/FileAPI/BlobRegistrationData.cpp:

(WebKit::BlobRegistrationData::encode):
(WebKit::BlobRegistrationData::decode):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/BlobData.h (modified) (1 diff)
• WebCore/platform/network/BlobRegistryImpl.cpp (modified) (2 diffs)
• WebCore/platform/network/BlobResourceHandle.cpp (modified) (1 diff)
• WebCore/platform/network/BlobStorageData.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/FileAPI/BlobRegistrationData.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-02  Alexey Proskuryakov  <ap@apple.com>
+
+        Remove Blob contentDisposition handling
+        https://bugs.webkit.org/show_bug.cgi?id=132490
+
+        Reviewed by Sam Weinig.
+
+        Dead code.
+
+        * platform/network/BlobData.h:
+        (WebCore::BlobData::contentDisposition): Deleted.
+        (WebCore::BlobData::setContentDisposition): Deleted.
+        * platform/network/BlobRegistryImpl.cpp:
+        (WebCore::BlobRegistryImpl::registerBlobURL):
+        (WebCore::BlobRegistryImpl::registerBlobURLForSlice):
+        * platform/network/BlobResourceHandle.cpp:
+        (WebCore::BlobResourceHandle::notifyResponseOnSuccess):
+        * platform/network/BlobStorageData.h:
+        (WebCore::BlobStorageData::create):
+        (WebCore::BlobStorageData::contentType):
+        (WebCore::BlobStorageData::BlobStorageData):
+        (WebCore::BlobStorageData::contentDisposition): Deleted.
+
 2014-05-02  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/platform/network/BlobData.h

@@ -168 +168 @@
     void setContentType(const String&);
 
-    const String& contentDisposition() const { return m_contentDisposition; }
-    void setContentDisposition(const String& contentDisposition) { m_contentDisposition = contentDisposition; }
-
     const BlobDataItemList& items() const { return m_items; }
     void swapItems(BlobDataItemList&);

trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp

@@ -122 +122 @@
     registerBlobResourceHandleConstructor();
 
-    RefPtr<BlobStorageData> blobStorageData = BlobStorageData::create(blobData->contentType(), blobData->contentDisposition());
+    RefPtr<BlobStorageData> blobStorageData = BlobStorageData::create(blobData->contentType());
 
     // The blob data is stored in the "canonical" way. That is, it only contains a list of Data and File items.
@@ -209 +209 @@
 
     unsigned long long newLength = end - start;
-    RefPtr<BlobStorageData> newStorageData = BlobStorageData::create(originalStorageData->contentType(), originalStorageData->contentDisposition());
+    RefPtr<BlobStorageData> newStorageData = BlobStorageData::create(originalStorageData->contentType());
 
     appendStorageItems(newStorageData.get(), originalStorageData->items(), start, newLength);

trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp

@@ -583 +583 @@
     response.setHTTPStatusCode(isRangeRequest ? httpPartialContent : httpOK);
     response.setHTTPStatusText(isRangeRequest ? httpPartialContentText : httpOKText);
-    if (!m_blobData->contentDisposition().isEmpty())
-        response.setHTTPHeaderField("Content-Disposition", m_blobData->contentDisposition());
+    // FIXME: If a resource identified with a blob: URL is a File object, user agents must use that file's name attribute,
+    // as if the response had a Content-Disposition header with the filename parameter set to the File's name attribute.
+    // Notably, this will affect a name suggested in "File Save As".
 
     // BlobResourceHandle cannot be used with downloading, and doesn't even wait for continueDidReceiveResponse.

trunk/Source/WebCore/platform/network/BlobStorageData.h

@@ -40 +40 @@
 class BlobStorageData : public RefCounted<BlobStorageData> {
 public:
-    static PassRefPtr<BlobStorageData> create(const String& contentType, const String& contentDisposition)
+    static PassRefPtr<BlobStorageData> create(const String& contentType)
     {
-        return adoptRef(new BlobStorageData(contentType, contentDisposition));
+        return adoptRef(new BlobStorageData(contentType));
     }
 
     const String& contentType() const { return m_data.contentType(); }
-    const String& contentDisposition() const { return m_data.contentDisposition(); }    
     const BlobDataItemList& items() const { return m_data.items(); }
 
@@ -52 +51 @@
     friend class BlobRegistryImpl;
 
-    BlobStorageData(const String& contentType, const String& contentDisposition)
+    BlobStorageData(const String& contentType)
     {
         m_data.setContentType(contentType);
-        m_data.setContentDisposition(contentDisposition);
     }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-02  Alexey Proskuryakov  <ap@apple.com>
+
+        Remove Blob contentDisposition handling
+        https://bugs.webkit.org/show_bug.cgi?id=132490
+
+        Reviewed by Sam Weinig.
+
+        * Shared/FileAPI/BlobRegistrationData.cpp:
+        (WebKit::BlobRegistrationData::encode):
+        (WebKit::BlobRegistrationData::decode):
+
 2014-05-02  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp

@@ -74 +74 @@
 {
     encoder << m_data->contentType();
-    encoder << m_data->contentDisposition();
 
     const BlobDataItemList& items = m_data->items();
@@ -114 +113 @@
         return false;
     result.m_data->setContentType(contentType);
-
-    String contentDisposition;
-    if (!decoder.decode(contentDisposition))
-        return false;
-    result.m_data->setContentDisposition(contentDisposition);
 
     uint64_t itemCount;