<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168201] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168201">168201</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-05-02 15:41:24 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobDatah">trunk/Source/WebCore/platform/network/BlobData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp">trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobResourceHandlecpp">trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobStorageDatah">trunk/Source/WebCore/platform/network/BlobStorageData.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedFileAPIBlobRegistrationDatacpp">trunk/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168200 => 168201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-02 22:39:52 UTC (rev 168200)
+++ trunk/Source/WebCore/ChangeLog 2014-05-02 22:41:24 UTC (rev 168201)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-05-02 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement FormData decoding using KeyedDecoder
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobData.h (168200 => 168201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobData.h 2014-05-02 22:39:52 UTC (rev 168200)
+++ trunk/Source/WebCore/platform/network/BlobData.h 2014-05-02 22:41:24 UTC (rev 168201)
</span><span class="lines">@@ -167,9 +167,6 @@
</span><span class="cx"> const String& contentType() const { return m_contentType; }
</span><span class="cx"> void setContentType(const String&);
</span><span class="cx">
</span><del>- const String& contentDisposition() const { return m_contentDisposition; }
- void setContentDisposition(const String& contentDisposition) { m_contentDisposition = contentDisposition; }
-
</del><span class="cx"> const BlobDataItemList& items() const { return m_items; }
</span><span class="cx"> void swapItems(BlobDataItemList&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp (168200 => 168201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2014-05-02 22:39:52 UTC (rev 168200)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2014-05-02 22:41:24 UTC (rev 168201)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> registerBlobResourceHandleConstructor();
</span><span class="cx">
</span><del>- RefPtr<BlobStorageData> blobStorageData = BlobStorageData::create(blobData->contentType(), blobData->contentDisposition());
</del><ins>+ RefPtr<BlobStorageData> blobStorageData = BlobStorageData::create(blobData->contentType());
</ins><span class="cx">
</span><span class="cx"> // The blob data is stored in the "canonical" way. That is, it only contains a list of Data and File items.
</span><span class="cx"> // 1) The Data item is denoted by the raw data and the range.
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> end = originalSize;
</span><span class="cx">
</span><span class="cx"> unsigned long long newLength = end - start;
</span><del>- RefPtr<BlobStorageData> newStorageData = BlobStorageData::create(originalStorageData->contentType(), originalStorageData->contentDisposition());
</del><ins>+ RefPtr<BlobStorageData> newStorageData = BlobStorageData::create(originalStorageData->contentType());
</ins><span class="cx">
</span><span class="cx"> appendStorageItems(newStorageData.get(), originalStorageData->items(), start, newLength);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp (168200 => 168201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp 2014-05-02 22:39:52 UTC (rev 168200)
+++ trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp 2014-05-02 22:41:24 UTC (rev 168201)
</span><span class="lines">@@ -582,8 +582,9 @@
</span><span class="cx"> response.setExpectedContentLength(m_totalRemainingSize);
</span><span class="cx"> response.setHTTPStatusCode(isRangeRequest ? httpPartialContent : httpOK);
</span><span class="cx"> response.setHTTPStatusText(isRangeRequest ? httpPartialContentText : httpOKText);
</span><del>- if (!m_blobData->contentDisposition().isEmpty())
- response.setHTTPHeaderField("Content-Disposition", m_blobData->contentDisposition());
</del><ins>+ // 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".
</ins><span class="cx">
</span><span class="cx"> // BlobResourceHandle cannot be used with downloading, and doesn't even wait for continueDidReceiveResponse.
</span><span class="cx"> // It's currently client's responsibility to know that didReceiveResponseAsync cannot be used to convert a
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobStorageDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobStorageData.h (168200 => 168201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobStorageData.h 2014-05-02 22:39:52 UTC (rev 168200)
+++ trunk/Source/WebCore/platform/network/BlobStorageData.h 2014-05-02 22:41:24 UTC (rev 168201)
</span><span class="lines">@@ -39,22 +39,20 @@
</span><span class="cx">
</span><span class="cx"> class BlobStorageData : public RefCounted<BlobStorageData> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<BlobStorageData> create(const String& contentType, const String& contentDisposition)
</del><ins>+ static PassRefPtr<BlobStorageData> create(const String& contentType)
</ins><span class="cx"> {
</span><del>- return adoptRef(new BlobStorageData(contentType, contentDisposition));
</del><ins>+ return adoptRef(new BlobStorageData(contentType));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& contentType() const { return m_data.contentType(); }
</span><del>- const String& contentDisposition() const { return m_data.contentDisposition(); }
</del><span class="cx"> const BlobDataItemList& items() const { return m_data.items(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class BlobRegistryImpl;
</span><span class="cx">
</span><del>- BlobStorageData(const String& contentType, const String& contentDisposition)
</del><ins>+ BlobStorageData(const String& contentType)
</ins><span class="cx"> {
</span><span class="cx"> m_data.setContentType(contentType);
</span><del>- m_data.setContentDisposition(contentDisposition);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BlobData m_data;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168200 => 168201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-02 22:39:52 UTC (rev 168200)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-02 22:41:24 UTC (rev 168201)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-05-02 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Adapt the rubberband constraints when the page get smaller than the scrollview - insets
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedFileAPIBlobRegistrationDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp (168200 => 168201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp 2014-05-02 22:39:52 UTC (rev 168200)
+++ trunk/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp 2014-05-02 22:41:24 UTC (rev 168201)
</span><span class="lines">@@ -73,7 +73,6 @@
</span><span class="cx"> void BlobRegistrationData::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><span class="cx"> encoder << m_data->contentType();
</span><del>- encoder << m_data->contentDisposition();
</del><span class="cx">
</span><span class="cx"> const BlobDataItemList& items = m_data->items();
</span><span class="cx"> encoder << static_cast<uint64_t>(items.size());
</span><span class="lines">@@ -114,11 +113,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> result.m_data->setContentType(contentType);
</span><span class="cx">
</span><del>- String contentDisposition;
- if (!decoder.decode(contentDisposition))
- return false;
- result.m_data->setContentDisposition(contentDisposition);
-
</del><span class="cx"> uint64_t itemCount;
</span><span class="cx"> if (!decoder.decode(itemCount))
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>