<!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>[168183] trunk/Source/WebCore</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/168183">168183</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-05-02 12:43:57 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't abuse Blob deserialization constructor in WebSocket
https://bugs.webkit.org/show_bug.cgi?id=132478
Reviewed by Sam Weinig.
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::send):
(WebCore::WebSocketChannel::enqueueBlobFrame): This is the important change -
Blob::create was called for no reason. If the blob came from a worker, it was
already cloned for cross-thread messaging, otherwise there is no reason to make
a new one.
* fileapi/Blob.h:
(WebCore::Blob::deserialize):
(WebCore::Blob::create): Deleted.
* fileapi/File.h:
(WebCore::File::deserialize):
(WebCore::File::create): Deleted.
Renamed a special case of "create" function to avoid explaining what it is for.
* Modules/websockets/ThreadableWebSocketChannel.h:
* Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::send):
* Modules/websockets/WebSocketChannel.h:
* Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
(WebCore::WorkerThreadableWebSocketChannel::send): Print a full URL in LOG(),
not one shortened to 1024 characters.
(WebCore::WorkerThreadableWebSocketChannel::Peer::send):
(WebCore::WorkerThreadableWebSocketChannel::mainThreadSendBlob):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::send):
* Modules/websockets/WorkerThreadableWebSocketChannel.h:
* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneDeserializer::readFile):
(WebCore::CloneDeserializer::readTerminal):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelh">trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketcpp">trunk/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelh">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh">trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValuecpp">trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiBlobh">trunk/Source/WebCore/fileapi/Blob.h</a></li>
<li><a href="#trunkSourceWebCorefileapiFileh">trunk/Source/WebCore/fileapi/File.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168182 => 168183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-02 19:42:57 UTC (rev 168182)
+++ trunk/Source/WebCore/ChangeLog 2014-05-02 19:43:57 UTC (rev 168183)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-05-02 Alexey Proskuryakov <ap@apple.com>
+
+ Don't abuse Blob deserialization constructor in WebSocket
+ https://bugs.webkit.org/show_bug.cgi?id=132478
+
+ Reviewed by Sam Weinig.
+
+ * Modules/websockets/WebSocketChannel.cpp:
+ (WebCore::WebSocketChannel::send):
+ (WebCore::WebSocketChannel::enqueueBlobFrame): This is the important change -
+ Blob::create was called for no reason. If the blob came from a worker, it was
+ already cloned for cross-thread messaging, otherwise there is no reason to make
+ a new one.
+
+ * fileapi/Blob.h:
+ (WebCore::Blob::deserialize):
+ (WebCore::Blob::create): Deleted.
+ * fileapi/File.h:
+ (WebCore::File::deserialize):
+ (WebCore::File::create): Deleted.
+ Renamed a special case of "create" function to avoid explaining what it is for.
+
+ * Modules/websockets/ThreadableWebSocketChannel.h:
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::WebSocket::send):
+ * Modules/websockets/WebSocketChannel.h:
+ * Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
+ (WebCore::WorkerThreadableWebSocketChannel::send): Print a full URL in LOG(),
+ not one shortened to 1024 characters.
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::send):
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadSendBlob):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::send):
+ * Modules/websockets/WorkerThreadableWebSocketChannel.h:
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::CloneDeserializer::readFile):
+ (WebCore::CloneDeserializer::readTerminal):
+
</ins><span class="cx"> 2014-05-02 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add and implement KeyedDecoder::decodeBytes
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h (168182 => 168183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h 2014-05-02 19:42:57 UTC (rev 168182)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h 2014-05-02 19:43:57 UTC (rev 168183)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> virtual String extensions() = 0; // Will be available after didConnect() callback is invoked.
</span><span class="cx"> virtual SendResult send(const String& message) = 0;
</span><span class="cx"> virtual SendResult send(const JSC::ArrayBuffer&, unsigned byteOffset, unsigned byteLength) = 0;
</span><del>- virtual SendResult send(const Blob&) = 0;
</del><ins>+ virtual SendResult send(Blob&) = 0;
</ins><span class="cx"> virtual unsigned long bufferedAmount() const = 0;
</span><span class="cx"> virtual void close(int code, const String& reason) = 0;
</span><span class="cx"> // Log the reason text and close the connection. Will call didClose().
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (168182 => 168183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2014-05-02 19:42:57 UTC (rev 168182)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2014-05-02 19:43:57 UTC (rev 168183)
</span><span class="lines">@@ -350,7 +350,6 @@
</span><span class="cx"> void WebSocket::send(Blob* binaryData, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "WebSocket %p send() Sending Blob '%s'", this, binaryData->url().stringCenterEllipsizedToLength().utf8().data());
</span><del>- ASSERT(binaryData);
</del><span class="cx"> if (m_state == CONNECTING) {
</span><span class="cx"> ec = INVALID_STATE_ERR;
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (168182 => 168183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2014-05-02 19:42:57 UTC (rev 168182)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2014-05-02 19:43:57 UTC (rev 168183)
</span><span class="lines">@@ -153,9 +153,9 @@
</span><span class="cx"> return ThreadableWebSocketChannel::SendSuccess;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ThreadableWebSocketChannel::SendResult WebSocketChannel::send(const Blob& binaryData)
</del><ins>+ThreadableWebSocketChannel::SendResult WebSocketChannel::send(Blob& binaryData)
</ins><span class="cx"> {
</span><del>- LOG(Network, "WebSocketChannel %p send() Sending Blob '%s'", this, binaryData.url().stringCenterEllipsizedToLength().utf8().data());
</del><ins>+ LOG(Network, "WebSocketChannel %p send() Sending Blob '%s'", this, binaryData.url().string().utf8().data());
</ins><span class="cx"> enqueueBlobFrame(WebSocketFrame::OpCodeBinary, binaryData);
</span><span class="cx"> processOutgoingFrameQueue();
</span><span class="cx"> return ThreadableWebSocketChannel::SendSuccess;
</span><span class="lines">@@ -695,13 +695,13 @@
</span><span class="cx"> m_outgoingFrameQueue.append(frame.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketChannel::enqueueBlobFrame(WebSocketFrame::OpCode opCode, const Blob& blob)
</del><ins>+void WebSocketChannel::enqueueBlobFrame(WebSocketFrame::OpCode opCode, Blob& blob)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_outgoingFrameQueueStatus == OutgoingFrameQueueOpen);
</span><span class="cx"> OwnPtr<QueuedFrame> frame = adoptPtr(new QueuedFrame);
</span><span class="cx"> frame->opCode = opCode;
</span><span class="cx"> frame->frameType = QueuedFrameTypeBlob;
</span><del>- frame->blobData = Blob::create(blob.url(), blob.type(), blob.size());
</del><ins>+ frame->blobData = &blob;
</ins><span class="cx"> m_outgoingFrameQueue.append(frame.release());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h (168182 => 168183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2014-05-02 19:42:57 UTC (rev 168182)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2014-05-02 19:43:57 UTC (rev 168183)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> virtual String extensions() override;
</span><span class="cx"> virtual ThreadableWebSocketChannel::SendResult send(const String& message) override;
</span><span class="cx"> virtual ThreadableWebSocketChannel::SendResult send(const JSC::ArrayBuffer&, unsigned byteOffset, unsigned byteLength) override;
</span><del>- virtual ThreadableWebSocketChannel::SendResult send(const Blob&) override;
</del><ins>+ virtual ThreadableWebSocketChannel::SendResult send(Blob&) override;
</ins><span class="cx"> virtual unsigned long bufferedAmount() const override;
</span><span class="cx"> virtual void close(int code, const String& reason) override; // Start closing handshake.
</span><span class="cx"> virtual void fail(const String& reason) override;
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> };
</span><span class="cx"> void enqueueTextFrame(const CString&);
</span><span class="cx"> void enqueueRawFrame(WebSocketFrame::OpCode, const char* data, size_t dataLength);
</span><del>- void enqueueBlobFrame(WebSocketFrame::OpCode, const Blob&);
</del><ins>+ void enqueueBlobFrame(WebSocketFrame::OpCode, Blob&);
</ins><span class="cx">
</span><span class="cx"> void processOutgoingFrameQueue();
</span><span class="cx"> void abortOutgoingFrameQueue();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp (168182 => 168183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2014-05-02 19:42:57 UTC (rev 168182)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2014-05-02 19:43:57 UTC (rev 168183)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> return m_bridge->send(binaryData, byteOffset, byteLength);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ThreadableWebSocketChannel::SendResult WorkerThreadableWebSocketChannel::send(const Blob& binaryData)
</del><ins>+ThreadableWebSocketChannel::SendResult WorkerThreadableWebSocketChannel::send(Blob& binaryData)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_bridge)
</span><span class="cx"> return ThreadableWebSocketChannel::SendFail;
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidSend, m_workerClientWrapper, sendRequestResult), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::Peer::send(const Blob& binaryData)
</del><ins>+void WorkerThreadableWebSocketChannel::Peer::send(Blob& binaryData)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> if (!m_mainWebSocketChannel || !m_workerClientWrapper)
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx"> ASSERT_UNUSED(context, context->isDocument());
</span><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><del>- RefPtr<Blob> blob = Blob::create(url, type, size);
</del><ins>+ RefPtr<Blob> blob = Blob::deserialize(url, type, size);
</ins><span class="cx"> peer->send(*blob);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> return clientWrapper->sendRequestResult();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ThreadableWebSocketChannel::SendResult WorkerThreadableWebSocketChannel::Bridge::send(const Blob& binaryData)
</del><ins>+ThreadableWebSocketChannel::SendResult WorkerThreadableWebSocketChannel::Bridge::send(Blob& binaryData)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_workerClientWrapper || !m_peer)
</span><span class="cx"> return ThreadableWebSocketChannel::SendFail;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h (168182 => 168183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2014-05-02 19:42:57 UTC (rev 168182)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2014-05-02 19:43:57 UTC (rev 168183)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> virtual String extensions() override;
</span><span class="cx"> virtual ThreadableWebSocketChannel::SendResult send(const String& message) override;
</span><span class="cx"> virtual ThreadableWebSocketChannel::SendResult send(const JSC::ArrayBuffer&, unsigned byteOffset, unsigned byteLength) override;
</span><del>- virtual ThreadableWebSocketChannel::SendResult send(const Blob&) override;
</del><ins>+ virtual ThreadableWebSocketChannel::SendResult send(Blob&) override;
</ins><span class="cx"> virtual unsigned long bufferedAmount() const override;
</span><span class="cx"> virtual void close(int code, const String& reason) override;
</span><span class="cx"> virtual void fail(const String& reason) override;
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> void connect(const URL&, const String& protocol);
</span><span class="cx"> void send(const String& message);
</span><span class="cx"> void send(const JSC::ArrayBuffer&);
</span><del>- void send(const Blob&);
</del><ins>+ void send(Blob&);
</ins><span class="cx"> void bufferedAmount();
</span><span class="cx"> void close(int code, const String& reason);
</span><span class="cx"> void fail(const String& reason);
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> void connect(const URL&, const String& protocol);
</span><span class="cx"> ThreadableWebSocketChannel::SendResult send(const String& message);
</span><span class="cx"> ThreadableWebSocketChannel::SendResult send(const JSC::ArrayBuffer&, unsigned byteOffset, unsigned byteLength);
</span><del>- ThreadableWebSocketChannel::SendResult send(const Blob&);
</del><ins>+ ThreadableWebSocketChannel::SendResult send(Blob&);
</ins><span class="cx"> unsigned long bufferedAmount();
</span><span class="cx"> void close(int code, const String& reason);
</span><span class="cx"> void fail(const String& reason);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (168182 => 168183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2014-05-02 19:42:57 UTC (rev 168182)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2014-05-02 19:43:57 UTC (rev 168183)
</span><span class="lines">@@ -1732,7 +1732,7 @@
</span><span class="cx"> if (!readStringData(type))
</span><span class="cx"> return 0;
</span><span class="cx"> if (m_isDOMGlobalObject)
</span><del>- file = File::create(path->string(), URL(URL(), url->string()), type->string());
</del><ins>+ file = File::deserialize(path->string(), URL(URL(), url->string()), type->string());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2231,7 +2231,7 @@
</span><span class="cx"> return JSValue();
</span><span class="cx"> if (!m_isDOMGlobalObject)
</span><span class="cx"> return jsNull();
</span><del>- return getJSValue(Blob::create(URL(URL(), url->string()), type->string(), size).get());
</del><ins>+ return getJSValue(Blob::deserialize(URL(URL(), url->string()), type->string(), size).get());
</ins><span class="cx"> }
</span><span class="cx"> case StringTag: {
</span><span class="cx"> CachedStringRef cachedString;
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/Blob.h (168182 => 168183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/Blob.h 2014-05-02 19:42:57 UTC (rev 168182)
+++ trunk/Source/WebCore/fileapi/Blob.h 2014-05-02 19:43:57 UTC (rev 168183)
</span><span class="lines">@@ -55,8 +55,7 @@
</span><span class="cx"> return adoptRef(new Blob(std::move(blobData)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // For deserialization.
- static PassRefPtr<Blob> create(const URL& srcURL, const String& type, long long size)
</del><ins>+ static PassRefPtr<Blob> deserialize(const URL& srcURL, const String& type, long long size)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(Blob::isNormalizedContentType(type));
</span><span class="cx"> return adoptRef(new Blob(srcURL, type, size));
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/File.h (168182 => 168183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/File.h 2014-05-02 19:42:57 UTC (rev 168182)
+++ trunk/Source/WebCore/fileapi/File.h 2014-05-02 19:43:57 UTC (rev 168183)
</span><span class="lines">@@ -49,8 +49,7 @@
</span><span class="cx"> return adoptRef(new File(path, policy));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // For deserialization.
- static PassRefPtr<File> create(const String& path, const URL& srcURL, const String& type)
</del><ins>+ static PassRefPtr<File> deserialize(const String& path, const URL& srcURL, const String& type)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new File(path, srcURL, type));
</span><span class="cx"> }
</span><span class="lines">@@ -76,10 +75,10 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> File(const String& path, ContentTypeLookupPolicy);
</span><ins>+ File(const String& path, const String& name, ContentTypeLookupPolicy);
</ins><span class="cx">
</span><span class="cx"> // For deserialization.
</span><span class="cx"> File(const String& path, const URL& srcURL, const String& type);
</span><del>- File(const String& path, const String& name, ContentTypeLookupPolicy);
</del><span class="cx">
</span><span class="cx"> String m_path;
</span><span class="cx"> String m_name;
</span></span></pre>
</div>
</div>
</body>
</html>