<!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>[168032] 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/168032">168032</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-04-30 10:50:04 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>https://bugs.webkit.org/show_bug.cgi?id=132363
Make Blob RawData immutable
Reviewed by Anders Carlsson.
Source/WebCore:
* Modules/websockets/WebSocket.cpp: (WebCore::WebSocket::didReceiveBinaryData):
Create RawData in one step.
* WebCore.exp.in: Don't export a constructor that we no longer have (and the new one is inline).
* fileapi/Blob.cpp: Removed entirely dead code.
* fileapi/WebKitBlobBuilder.cpp:
* fileapi/WebKitBlobBuilder.h:
Updated to collect data in a plain Vector, so that we don't have to modify RawData.
Removed FIXMEs about renaming - there used to be a BlobBuilder exposed to JS, but
now this is just a helper to implement JS Blob constructor. We should probably
still rename it, but not how the FIXME suggested.
* platform/network/BlobData.cpp:
(WebCore::BlobDataItem::detachFromCurrentThread): RawData::detachFromCurrentThread()
was a no-op.
(WebCore::BlobDataHandle::BlobDataHandle): Deleted. This was entirely dead code.
(WebCore::BlobDataHandle::~BlobDataHandle): Ditto.
* platform/network/BlobData.h: Made RawData immutable.
* xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::responseBlob):
Create RawData in one step.
Source/WebKit2:
* Shared/FileAPI/BlobRegistrationData.cpp: (WebKit::BlobRegistrationData::decode):
Create RawData in one step.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketcpp">trunk/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorefileapiBlobcpp">trunk/Source/WebCore/fileapi/Blob.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiWebKitBlobBuildercpp">trunk/Source/WebCore/fileapi/WebKitBlobBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiWebKitBlobBuilderh">trunk/Source/WebCore/fileapi/WebKitBlobBuilder.h</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobDatacpp">trunk/Source/WebCore/platform/network/BlobData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobDatah">trunk/Source/WebCore/platform/network/BlobData.h</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</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 (168031 => 168032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-30 17:41:39 UTC (rev 168031)
+++ trunk/Source/WebCore/ChangeLog 2014-04-30 17:50:04 UTC (rev 168032)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-04-30 Alexey Proskuryakov <ap@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=132363
+ Make Blob RawData immutable
+
+ Reviewed by Anders Carlsson.
+
+ * Modules/websockets/WebSocket.cpp: (WebCore::WebSocket::didReceiveBinaryData):
+ Create RawData in one step.
+
+ * WebCore.exp.in: Don't export a constructor that we no longer have (and the new one is inline).
+
+ * fileapi/Blob.cpp: Removed entirely dead code.
+
+ * fileapi/WebKitBlobBuilder.cpp:
+ * fileapi/WebKitBlobBuilder.h:
+ Updated to collect data in a plain Vector, so that we don't have to modify RawData.
+ Removed FIXMEs about renaming - there used to be a BlobBuilder exposed to JS, but
+ now this is just a helper to implement JS Blob constructor. We should probably
+ still rename it, but not how the FIXME suggested.
+
+ * platform/network/BlobData.cpp:
+ (WebCore::BlobDataItem::detachFromCurrentThread): RawData::detachFromCurrentThread()
+ was a no-op.
+ (WebCore::BlobDataHandle::BlobDataHandle): Deleted. This was entirely dead code.
+ (WebCore::BlobDataHandle::~BlobDataHandle): Ditto.
+
+ * platform/network/BlobData.h: Made RawData immutable.
+
+ * xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::responseBlob):
+ Create RawData in one step.
+
</ins><span class="cx"> 2014-04-30 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Region offset not factored in when mapping to local coords
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (168031 => 168032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2014-04-30 17:41:39 UTC (rev 168031)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2014-04-30 17:50:04 UTC (rev 168032)
</span><span class="lines">@@ -522,10 +522,8 @@
</span><span class="cx"> switch (m_binaryType) {
</span><span class="cx"> case BinaryTypeBlob: {
</span><span class="cx"> size_t size = binaryData->size();
</span><del>- RefPtr<RawData> rawData = RawData::create();
- binaryData->swap(*rawData->mutableData());
</del><span class="cx"> auto blobData = std::make_unique<BlobData>();
</span><del>- blobData->appendData(rawData.release(), 0, BlobDataItem::toEndOfFile);
</del><ins>+ blobData->appendData(RawData::create(std::move(*binaryData)), 0, BlobDataItem::toEndOfFile);
</ins><span class="cx"> RefPtr<Blob> blob = Blob::create(std::move(blobData), size);
</span><span class="cx"> dispatchEvent(MessageEvent::create(blob.release(), SecurityOrigin::create(m_url)->toString()));
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (168031 => 168032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-30 17:41:39 UTC (rev 168031)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-30 17:50:04 UTC (rev 168032)
</span><span class="lines">@@ -2842,7 +2842,6 @@
</span><span class="cx"> __ZN7WebCore12BlobRegistryD2Ev
</span><span class="cx"> __ZN7WebCore12blobRegistryEv
</span><span class="cx"> __ZN7WebCore14LoaderStrategy18createBlobRegistryEv
</span><del>-__ZN7WebCore7RawDataC1Ev
</del><span class="cx"> __ZN7WebCore8BlobData10appendDataEN3WTF10PassRefPtrINS_7RawDataEEExx
</span><span class="cx"> __ZN7WebCore8BlobData10appendFileERKN3WTF6StringExxd
</span><span class="cx"> __ZTVN7WebCore12BlobRegistryE
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/Blob.cpp (168031 => 168032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/Blob.cpp 2014-04-30 17:41:39 UTC (rev 168031)
+++ trunk/Source/WebCore/fileapi/Blob.cpp 2014-04-30 17:50:04 UTC (rev 168032)
</span><span class="lines">@@ -40,17 +40,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-namespace {
-
-// Used in histograms to see when we can actually deprecate the prefixed slice.
-enum SliceHistogramEnum {
- SliceWithoutPrefix,
- SliceWithPrefix,
- SliceHistogramEnumMax,
-};
-
-} // namespace
-
</del><span class="cx"> class BlobURLRegistry final : public URLRegistry {
</span><span class="cx"> public:
</span><span class="cx"> virtual void registerURL(SecurityOrigin*, const URL&, URLRegistrable*) override;
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiWebKitBlobBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/WebKitBlobBuilder.cpp (168031 => 168032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/WebKitBlobBuilder.cpp 2014-04-30 17:41:39 UTC (rev 168031)
+++ trunk/Source/WebCore/fileapi/WebKitBlobBuilder.cpp 2014-04-30 17:50:04 UTC (rev 168032)
</span><span class="lines">@@ -48,8 +48,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: Move this file to BlobBuilder.cpp
-
</del><span class="cx"> enum BlobConstructorArrayBufferOrView {
</span><span class="cx"> BlobConstructorArrayBuffer,
</span><span class="cx"> BlobConstructorArrayBufferView,
</span><span class="lines">@@ -61,29 +59,19 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<char>& BlobBuilder::getBuffer()
-{
- // If the last item is not a data item, create one. Otherwise, we simply append the new string to the last data item.
- if (m_items.isEmpty() || m_items[m_items.size() - 1].type != BlobDataItem::Data)
- m_items.append(BlobDataItem(RawData::create()));
-
- return *m_items[m_items.size() - 1].data->mutableData();
-}
-
</del><span class="cx"> void BlobBuilder::append(const String& text, const String& endingType)
</span><span class="cx"> {
</span><span class="cx"> CString utf8Text = UTF8Encoding().encode(text, EntitiesForUnencodables);
</span><span class="cx">
</span><del>- Vector<char>& buffer = getBuffer();
- size_t oldSize = buffer.size();
</del><ins>+ size_t oldSize = m_appendableData.size();
</ins><span class="cx">
</span><span class="cx"> if (endingType == "native")
</span><del>- normalizeLineEndingsToNative(utf8Text, buffer);
</del><ins>+ normalizeLineEndingsToNative(utf8Text, m_appendableData);
</ins><span class="cx"> else {
</span><span class="cx"> ASSERT(endingType == "transparent");
</span><del>- buffer.append(utf8Text.data(), utf8Text.length());
</del><ins>+ m_appendableData.append(utf8Text.data(), utf8Text.length());
</ins><span class="cx"> }
</span><del>- m_size += buffer.size() - oldSize;
</del><ins>+ m_size += m_appendableData.size() - oldSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BLOB)
</span><span class="lines">@@ -112,6 +100,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!blob)
</span><span class="cx"> return;
</span><ins>+ if (!m_appendableData.isEmpty())
+ m_items.append(BlobDataItem(RawData::create(std::move(m_appendableData))));
</ins><span class="cx"> if (blob->isFile()) {
</span><span class="cx"> File* file = toFile(blob);
</span><span class="cx"> // If the blob is file that is not snapshoted, capture the snapshot now.
</span><span class="lines">@@ -131,14 +121,16 @@
</span><span class="cx">
</span><span class="cx"> void BlobBuilder::appendBytesData(const void* data, size_t length)
</span><span class="cx"> {
</span><del>- Vector<char>& buffer = getBuffer();
- size_t oldSize = buffer.size();
- buffer.append(static_cast<const char*>(data), length);
- m_size += buffer.size() - oldSize;
</del><ins>+ size_t oldSize = m_appendableData.size();
+ m_appendableData.append(static_cast<const char*>(data), length);
+ m_size += m_appendableData.size() - oldSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Blob> BlobBuilder::getBlob(const String& contentType)
</span><span class="cx"> {
</span><ins>+ if (!m_appendableData.isEmpty())
+ m_items.append(BlobDataItem(RawData::create(std::move(m_appendableData))));
+
</ins><span class="cx"> auto blobData = std::make_unique<BlobData>();
</span><span class="cx"> blobData->setContentType(Blob::normalizedContentType(contentType));
</span><span class="cx"> blobData->swapItems(m_items);
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiWebKitBlobBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/WebKitBlobBuilder.h (168031 => 168032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/WebKitBlobBuilder.h 2014-04-30 17:41:39 UTC (rev 168031)
+++ trunk/Source/WebCore/fileapi/WebKitBlobBuilder.h 2014-04-30 17:50:04 UTC (rev 168032)
</span><span class="lines">@@ -41,8 +41,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// FIXME: Move this file to BlobBuilder.h
-
</del><span class="cx"> class Blob;
</span><span class="cx"> class TextEncoding;
</span><span class="cx">
</span><span class="lines">@@ -64,10 +62,9 @@
</span><span class="cx"> private:
</span><span class="cx"> void appendBytesData(const void*, size_t);
</span><span class="cx">
</span><del>- Vector<char>& getBuffer();
-
</del><span class="cx"> long long m_size;
</span><span class="cx"> BlobDataItemList m_items;
</span><ins>+ Vector<char> m_appendableData;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (168031 => 168032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2014-04-30 17:41:39 UTC (rev 168031)
+++ trunk/Source/WebCore/page/DragController.cpp 2014-04-30 17:50:04 UTC (rev 168032)
</span><span class="lines">@@ -182,8 +182,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (RefPtr<FrameView> v = m_page.mainFrame().view()) {
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><del>- DataTransferAccessPolicy policy = (m_page.mainFrame().settings().usesDashboardBackwardCompatibilityMode() && (!m_documentUnderMouse || m_documentUnderMouse->securityOrigin()->isLocal())) ?
- DataTransferAccessPolicy::Readable : DataTransferAccessPolicy::TypesReadable;
</del><ins>+ DataTransferAccessPolicy policy = (m_page.mainFrame().settings().usesDashboardBackwardCompatibilityMode() && (!m_documentUnderMouse || m_documentUnderMouse->securityOrigin()->isLocal()))
+ ? DataTransferAccessPolicy::Readable : DataTransferAccessPolicy::TypesReadable;
</ins><span class="cx"> #else
</span><span class="cx"> DataTransferAccessPolicy policy = DataTransferAccessPolicy::TypesReadable;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobData.cpp (168031 => 168032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobData.cpp 2014-04-30 17:41:39 UTC (rev 168031)
+++ trunk/Source/WebCore/platform/network/BlobData.cpp 2014-04-30 17:50:04 UTC (rev 168032)
</span><span class="lines">@@ -45,17 +45,8 @@
</span><span class="cx">
</span><span class="cx"> const long long BlobDataItem::toEndOfFile = -1;
</span><span class="cx">
</span><del>-RawData::RawData()
-{
-}
-
-void RawData::detachFromCurrentThread()
-{
-}
-
</del><span class="cx"> void BlobDataItem::detachFromCurrentThread()
</span><span class="cx"> {
</span><del>- data->detachFromCurrentThread();
</del><span class="cx"> path = path.isolatedCopy();
</span><span class="cx"> url = url.copy();
</span><span class="cx"> }
</span><span class="lines">@@ -99,17 +90,4 @@
</span><span class="cx"> m_items.swap(items);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-BlobDataHandle::BlobDataHandle(std::unique_ptr<BlobData> data, long long size)
-{
- UNUSED_PARAM(size);
- m_internalURL = BlobURL::createInternalURL();
- ThreadableBlobRegistry::registerBlobURL(m_internalURL, std::move(data));
-}
-
-BlobDataHandle::~BlobDataHandle()
-{
- ThreadableBlobRegistry::unregisterBlobURL(m_internalURL);
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobData.h (168031 => 168032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobData.h 2014-04-30 17:41:39 UTC (rev 168031)
+++ trunk/Source/WebCore/platform/network/BlobData.h 2014-04-30 17:50:04 UTC (rev 168032)
</span><span class="lines">@@ -42,19 +42,26 @@
</span><span class="cx">
</span><span class="cx"> class RawData : public ThreadSafeRefCounted<RawData> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<RawData> create()
</del><ins>+ static PassRefPtr<RawData> create(Vector<char>&& data)
</ins><span class="cx"> {
</span><del>- return adoptRef(new RawData());
</del><ins>+ return adoptRef(new RawData(std::move(data)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void detachFromCurrentThread();
</del><ins>+ static PassRefPtr<RawData> create(const char* data, size_t size)
+ {
+ Vector<char> dataVector(size);
+ memcpy(dataVector.data(), data, size);
+ return adoptRef(new RawData(std::move(dataVector)));
+ }
</ins><span class="cx">
</span><span class="cx"> const char* data() const { return m_data.data(); }
</span><span class="cx"> size_t length() const { return m_data.size(); }
</span><del>- Vector<char>* mutableData() { return &m_data; }
</del><span class="cx">
</span><span class="cx"> private:
</span><del>- RawData();
</del><ins>+ RawData(Vector<char>&& data)
+ : m_data(std::move(data))
+ {
+ }
</ins><span class="cx">
</span><span class="cx"> Vector<char> m_data;
</span><span class="cx"> };
</span><span class="lines">@@ -183,23 +190,6 @@
</span><span class="cx"> BlobDataItemList m_items;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-// FIXME: This class is mostly place holder until I get farther along with
-// https://bugs.webkit.org/show_bug.cgi?id=108733 and more specifically with landing
-// https://codereview.chromium.org/11192017/.
-class BlobDataHandle : public ThreadSafeRefCounted<BlobDataHandle> {
-public:
- static PassRefPtr<BlobDataHandle> create(std::unique_ptr<BlobData> data, long long size)
- {
- return adoptRef(new BlobDataHandle(std::move(data), size));
- }
-
- ~BlobDataHandle();
-
-private:
- BlobDataHandle(std::unique_ptr<BlobData>, long long size);
- URL m_internalURL;
-};
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // BlobData_h
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (168031 => 168032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-04-30 17:41:39 UTC (rev 168031)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-04-30 17:50:04 UTC (rev 168032)
</span><span class="lines">@@ -288,26 +288,19 @@
</span><span class="cx"> ASSERT(doneWithoutErrors());
</span><span class="cx">
</span><span class="cx"> if (!m_responseBlob) {
</span><del>- // FIXME: This causes two (or more) unnecessary copies of the data.
- // Chromium stores blob data in the browser process, so we're pulling the data
- // from the network only to copy it into the renderer to copy it back to the browser.
- // Ideally we'd get the blob/file-handle from the ResourceResponse directly
- // instead of copying the bytes. Embedders who store blob data in the
- // same process as WebCore would at least to teach BlobData to take
- // a SharedBuffer, even if they don't get the Blob from the network layer directly.
- auto blobData = std::make_unique<BlobData>();
- // If we errored out or got no data, we still return a blob, just an empty one.
- size_t size = 0;
</del><span class="cx"> if (m_binaryResponseBuilder) {
</span><del>- RefPtr<RawData> rawData = RawData::create();
- size = m_binaryResponseBuilder->size();
- rawData->mutableData()->append(m_binaryResponseBuilder->data(), size);
- blobData->appendData(rawData, 0, BlobDataItem::toEndOfFile);
</del><ins>+ // FIXME: We just received the data from NetworkProcess, and are sending it back. This is inefficient.
+ unsigned size = m_binaryResponseBuilder->size();
+ auto blobData = std::make_unique<BlobData>();
+ blobData->appendData(RawData::create(m_binaryResponseBuilder->data(), size), 0, BlobDataItem::toEndOfFile);
</ins><span class="cx"> String normalizedContentType = Blob::normalizedContentType(responseMIMEType());
</span><span class="cx"> blobData->setContentType(normalizedContentType); // responseMIMEType defaults to text/xml which may be incorrect.
</span><span class="cx"> m_binaryResponseBuilder.clear();
</span><ins>+ m_responseBlob = Blob::create(std::move(blobData), size);
+ } else {
+ // If we errored out or got no data, we still return a blob, just an empty one.
+ m_responseBlob = Blob::create();
</ins><span class="cx"> }
</span><del>- m_responseBlob = Blob::create(std::move(blobData), size);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return m_responseBlob.get();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168031 => 168032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-30 17:41:39 UTC (rev 168031)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-30 17:50:04 UTC (rev 168032)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-30 Alexey Proskuryakov <ap@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=132363
+ Make Blob RawData immutable
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/FileAPI/BlobRegistrationData.cpp: (WebKit::BlobRegistrationData::decode):
+ Create RawData in one step.
+
</ins><span class="cx"> 2014-04-30 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Followup to: Handle selection services menu.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedFileAPIBlobRegistrationDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp (168031 => 168032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp 2014-04-30 17:41:39 UTC (rev 168031)
+++ trunk/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp 2014-04-30 17:50:04 UTC (rev 168032)
</span><span class="lines">@@ -132,8 +132,7 @@
</span><span class="cx"> IPC::DataReference data;
</span><span class="cx"> if (!decoder.decode(data))
</span><span class="cx"> return false;
</span><del>- RefPtr<RawData> rawData = RawData::create();
- rawData->mutableData()->append(data.data(), data.size());
</del><ins>+ RefPtr<RawData> rawData = RawData::create(reinterpret_cast<const char*>(data.data()), data.size());
</ins><span class="cx"> result.m_data->appendData(rawData.release(), 0, BlobDataItem::toEndOfFile);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>