<!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>[168435] 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/168435">168435</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-05-07 11:57:35 -0700 (Wed, 07 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make blob size computation lazy
https://bugs.webkit.org/show_bug.cgi?id=132653
Reviewed by Anders Carlsson.
Source/WebCore:
* fileapi/Blob.cpp:
(WebCore::Blob::Blob):
(WebCore::Blob::size):
* fileapi/Blob.h:
(WebCore::Blob::size): Deleted.
* fileapi/File.cpp:
(WebCore::File::size): Deleted.
* fileapi/File.h:
* fileapi/ThreadableBlobRegistry.cpp:
(WebCore::ThreadableBlobRegistry::registerFileBlobURL):
(WebCore::ThreadableBlobRegistry::registerBlobURL):
(WebCore::ThreadableBlobRegistry::registerBlobURLForSlice):
(WebCore::ThreadableBlobRegistry::blobSize):
(WebCore::ThreadableBlobRegistry::unregisterBlobURL):
(WebCore::unregisterBlobURLTask): Deleted.
* fileapi/ThreadableBlobRegistry.h:
* platform/network/BlobData.cpp:
(WebCore::BlobData::appendData):
* platform/network/BlobRegistry.h:
* platform/network/BlobRegistryImpl.cpp:
(WebCore::BlobRegistryImpl::registerBlobURL):
(WebCore::BlobRegistryImpl::registerBlobURLForSlice):
* platform/network/BlobRegistryImpl.h:
Source/WebKit2:
* NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
(WebKit::NetworkBlobRegistry::registerBlobURL):
(WebKit::NetworkBlobRegistry::registerBlobURLForSlice):
(WebKit::NetworkBlobRegistry::blobSize):
* NetworkProcess/FileAPI/NetworkBlobRegistry.h:
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::registerBlobURL):
(WebKit::NetworkConnectionToWebProcess::registerBlobURLForSlice):
(WebKit::NetworkConnectionToWebProcess::blobSize):
* NetworkProcess/NetworkConnectionToWebProcess.h:
* NetworkProcess/NetworkConnectionToWebProcess.messages.in:
* WebProcess/FileAPI/BlobRegistryProxy.cpp:
(WebKit::BlobRegistryProxy::registerBlobURL):
(WebKit::BlobRegistryProxy::registerBlobURLForSlice):
(WebKit::BlobRegistryProxy::blobSize):
* WebProcess/FileAPI/BlobRegistryProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorefileapiBlobcpp">trunk/Source/WebCore/fileapi/Blob.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiBlobh">trunk/Source/WebCore/fileapi/Blob.h</a></li>
<li><a href="#trunkSourceWebCorefileapiFilecpp">trunk/Source/WebCore/fileapi/File.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiFileh">trunk/Source/WebCore/fileapi/File.h</a></li>
<li><a href="#trunkSourceWebCorefileapiThreadableBlobRegistrycpp">trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiThreadableBlobRegistryh">trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobDatacpp">trunk/Source/WebCore/platform/network/BlobData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryh">trunk/Source/WebCore/platform/network/BlobRegistry.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp">trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryImplh">trunk/Source/WebCore/platform/network/BlobRegistryImpl.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp">trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistryh">trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxycpp">trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxyh">trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebCore/ChangeLog 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-05-07 Alexey Proskuryakov <ap@apple.com>
+
+ Make blob size computation lazy
+ https://bugs.webkit.org/show_bug.cgi?id=132653
+
+ Reviewed by Anders Carlsson.
+
+ * fileapi/Blob.cpp:
+ (WebCore::Blob::Blob):
+ (WebCore::Blob::size):
+ * fileapi/Blob.h:
+ (WebCore::Blob::size): Deleted.
+ * fileapi/File.cpp:
+ (WebCore::File::size): Deleted.
+ * fileapi/File.h:
+ * fileapi/ThreadableBlobRegistry.cpp:
+ (WebCore::ThreadableBlobRegistry::registerFileBlobURL):
+ (WebCore::ThreadableBlobRegistry::registerBlobURL):
+ (WebCore::ThreadableBlobRegistry::registerBlobURLForSlice):
+ (WebCore::ThreadableBlobRegistry::blobSize):
+ (WebCore::ThreadableBlobRegistry::unregisterBlobURL):
+ (WebCore::unregisterBlobURLTask): Deleted.
+ * fileapi/ThreadableBlobRegistry.h:
+ * platform/network/BlobData.cpp:
+ (WebCore::BlobData::appendData):
+ * platform/network/BlobRegistry.h:
+ * platform/network/BlobRegistryImpl.cpp:
+ (WebCore::BlobRegistryImpl::registerBlobURL):
+ (WebCore::BlobRegistryImpl::registerBlobURLForSlice):
+ * platform/network/BlobRegistryImpl.h:
+
</ins><span class="cx"> 2014-05-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add scrolling tree logging to RemoteLayerTree output
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/Blob.cpp (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/Blob.cpp 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebCore/fileapi/Blob.cpp 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -79,18 +79,20 @@
</span><span class="cx">
</span><span class="cx"> Blob::Blob(Vector<char> data, const String& contentType)
</span><span class="cx"> : m_type(contentType)
</span><ins>+ , m_size(data.size())
</ins><span class="cx"> {
</span><span class="cx"> Vector<BlobPart> blobParts;
</span><span class="cx"> blobParts.append(BlobPart(std::move(data)));
</span><span class="cx"> m_internalURL = BlobURL::createInternalURL();
</span><del>- m_size = ThreadableBlobRegistry::registerBlobURL(m_internalURL, std::move(blobParts), contentType);
</del><ins>+ ThreadableBlobRegistry::registerBlobURL(m_internalURL, std::move(blobParts), contentType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Blob::Blob(Vector<BlobPart> blobParts, const String& contentType)
</span><span class="cx"> : m_type(contentType)
</span><ins>+ , m_size(-1)
</ins><span class="cx"> {
</span><span class="cx"> m_internalURL = BlobURL::createInternalURL();
</span><del>- m_size = ThreadableBlobRegistry::registerBlobURL(m_internalURL, std::move(blobParts), contentType);
</del><ins>+ ThreadableBlobRegistry::registerBlobURL(m_internalURL, std::move(blobParts), contentType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Blob::Blob(DeserializationContructor, const URL& srcURL, const String& type, long long size)
</span><span class="lines">@@ -104,9 +106,10 @@
</span><span class="cx"> #if ENABLE(BLOB)
</span><span class="cx"> Blob::Blob(const URL& srcURL, long long start, long long end, const String& type)
</span><span class="cx"> : m_type(Blob::normalizedContentType(type))
</span><ins>+ , m_size(-1) // size is not necessarily equal to end - start.
</ins><span class="cx"> {
</span><span class="cx"> m_internalURL = BlobURL::createInternalURL();
</span><del>- m_size = ThreadableBlobRegistry::registerBlobURLForSlice(m_internalURL, srcURL, start, end);
</del><ins>+ ThreadableBlobRegistry::registerBlobURLForSlice(m_internalURL, srcURL, start, end);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -115,6 +118,18 @@
</span><span class="cx"> ThreadableBlobRegistry::unregisterBlobURL(m_internalURL);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+unsigned long long Blob::size() const
+{
+ if (m_size < 0) {
+ // FIXME: JavaScript cannot represent sizes as large as unsigned long long, we need to
+ // come up with an exception to throw if file size is not representable.
+ unsigned long long actualSize = ThreadableBlobRegistry::blobSize(m_internalURL);
+ m_size = (actualSize <= std::numeric_limits<long long>::max()) ? static_cast<long long>(actualSize) : 0;
+ }
+
+ return static_cast<unsigned long long>(m_size);
+}
+
</ins><span class="cx"> bool Blob::isValidContentType(const String& contentType)
</span><span class="cx"> {
</span><span class="cx"> if (contentType.isNull())
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/Blob.h (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/Blob.h 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebCore/fileapi/Blob.h 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> const URL& url() const { return m_internalURL; }
</span><span class="cx"> const String& type() const { return m_type; }
</span><span class="cx">
</span><del>- virtual unsigned long long size() const { return static_cast<unsigned long long>(m_size); }
</del><ins>+ unsigned long long size() const;
</ins><span class="cx"> virtual bool isFile() const { return false; }
</span><span class="cx">
</span><span class="cx"> // The checks described in the File API spec.
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> URL m_internalURL;
</span><span class="cx">
</span><span class="cx"> String m_type;
</span><del>- long long m_size;
</del><ins>+ mutable long long m_size;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/File.cpp (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/File.cpp 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebCore/fileapi/File.cpp 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -77,16 +77,6 @@
</span><span class="cx"> return currentTime() * msPerSecond;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long long File::size() const
-{
- // FIXME: JavaScript cannot represent sizes as large as unsigned long long, we need to
- // come up with an exception to throw if file size is not representable.
- long long size;
- if (!getFileSize(m_path, size))
- return 0;
- return static_cast<unsigned long long>(size);
-}
-
</del><span class="cx"> String File::contentTypeFromFilePathOrName(const String& name)
</span><span class="cx"> {
</span><span class="cx"> String type;
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/File.h (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/File.h 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebCore/fileapi/File.h 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -54,13 +54,12 @@
</span><span class="cx"> return adoptRef(new File(path, name));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual unsigned long long size() const override;
</del><span class="cx"> virtual bool isFile() const override { return true; }
</span><span class="cx">
</span><span class="cx"> const String& path() const { return m_path; }
</span><span class="cx"> const String& name() const { return m_name; }
</span><span class="cx">
</span><del>- // This returns the current date and time if the file's last modifiecation date is not known (per spec: http://www.w3.org/TR/FileAPI/#dfn-lastModifiedDate).
</del><ins>+ // This returns the current date and time if the file's last modification date is not known (per spec: http://www.w3.org/TR/FileAPI/#dfn-lastModifiedDate).
</ins><span class="cx"> double lastModifiedDate() const;
</span><span class="cx">
</span><span class="cx"> static String contentTypeFromFilePathOrName(const String&);
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiThreadableBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -106,7 +106,6 @@
</span><span class="cx"> else {
</span><span class="cx"> // BlobRegistryContext performs an isolated copy of data.
</span><span class="cx"> BlobRegistryContext* context = new BlobRegistryContext(url, path, contentType);
</span><del>- BinarySemaphore semaphore;
</del><span class="cx"> callOnMainThread([context] {
</span><span class="cx"> std::unique_ptr<BlobRegistryContext> blobRegistryContext(context);
</span><span class="cx"> blobRegistry().registerFileBlobURL(blobRegistryContext->url, blobRegistryContext->path, blobRegistryContext->contentType);
</span><span class="lines">@@ -114,23 +113,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long long ThreadableBlobRegistry::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
</del><ins>+void ThreadableBlobRegistry::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
</ins><span class="cx"> {
</span><del>- unsigned long long resultSize;
</del><span class="cx"> if (isMainThread())
</span><del>- resultSize = blobRegistry().registerBlobURL(url, std::move(blobParts), contentType);
</del><ins>+ blobRegistry().registerBlobURL(url, std::move(blobParts), contentType);
</ins><span class="cx"> else {
</span><span class="cx"> // BlobRegistryContext performs an isolated copy of data.
</span><span class="cx"> BlobRegistryContext* context = new BlobRegistryContext(url, std::move(blobParts), contentType);
</span><del>- BinarySemaphore semaphore;
- callOnMainThread([context, &semaphore, &resultSize] {
</del><ins>+ callOnMainThread([context] {
</ins><span class="cx"> std::unique_ptr<BlobRegistryContext> blobRegistryContext(context);
</span><del>- resultSize = blobRegistry().registerBlobURL(blobRegistryContext->url, std::move(blobRegistryContext->blobParts), blobRegistryContext->contentType);
- semaphore.signal();
</del><ins>+ blobRegistry().registerBlobURL(blobRegistryContext->url, std::move(blobRegistryContext->blobParts), blobRegistryContext->contentType);
</ins><span class="cx"> });
</span><del>- semaphore.wait(std::numeric_limits<double>::max());
</del><span class="cx"> }
</span><del>- return resultSize;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableBlobRegistry::registerBlobURL(SecurityOrigin* origin, const URL& url, const URL& srcURL)
</span><span class="lines">@@ -151,18 +145,32 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long long ThreadableBlobRegistry::registerBlobURLForSlice(const URL& newURL, const URL& srcURL, long long start, long long end)
</del><ins>+void ThreadableBlobRegistry::registerBlobURLForSlice(const URL& newURL, const URL& srcURL, long long start, long long end)
</ins><span class="cx"> {
</span><ins>+ if (isMainThread())
+ blobRegistry().registerBlobURLForSlice(newURL, srcURL, start, end);
+ else {
+ // BlobRegistryContext performs an isolated copy of data.
+ BlobRegistryContext* context = new BlobRegistryContext(newURL, srcURL);
+ callOnMainThread([context, start, end] {
+ std::unique_ptr<BlobRegistryContext> blobRegistryContext(context);
+ blobRegistry().registerBlobURLForSlice(blobRegistryContext->url, blobRegistryContext->srcURL, start, end);
+ });
+ }
+}
+
+unsigned long long ThreadableBlobRegistry::blobSize(const URL& url)
+{
</ins><span class="cx"> unsigned long long resultSize;
</span><span class="cx"> if (isMainThread())
</span><del>- resultSize = blobRegistry().registerBlobURLForSlice(newURL, srcURL, start, end);
</del><ins>+ resultSize = blobRegistry().blobSize(url);
</ins><span class="cx"> else {
</span><span class="cx"> // BlobRegistryContext performs an isolated copy of data.
</span><del>- BlobRegistryContext* context = new BlobRegistryContext(newURL, srcURL);
</del><ins>+ BlobRegistryContext* context = new BlobRegistryContext(url);
</ins><span class="cx"> BinarySemaphore semaphore;
</span><del>- callOnMainThread([context, start, end, &semaphore, &resultSize] {
</del><ins>+ callOnMainThread([context, &semaphore, &resultSize] {
</ins><span class="cx"> std::unique_ptr<BlobRegistryContext> blobRegistryContext(context);
</span><del>- resultSize = blobRegistry().registerBlobURLForSlice(blobRegistryContext->url, blobRegistryContext->srcURL, start, end);
</del><ins>+ resultSize = blobRegistry().blobSize(blobRegistryContext->url);
</ins><span class="cx"> semaphore.signal();
</span><span class="cx"> });
</span><span class="cx"> semaphore.wait(std::numeric_limits<double>::max());
</span><span class="lines">@@ -170,12 +178,6 @@
</span><span class="cx"> return resultSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void unregisterBlobURLTask(void* context)
-{
- std::unique_ptr<BlobRegistryContext> blobRegistryContext(static_cast<BlobRegistryContext*>(context));
- blobRegistry().unregisterBlobURL(blobRegistryContext->url);
-}
-
</del><span class="cx"> void ThreadableBlobRegistry::unregisterBlobURL(const URL& url)
</span><span class="cx"> {
</span><span class="cx"> if (BlobURL::getOrigin(url) == "null")
</span><span class="lines">@@ -183,8 +185,14 @@
</span><span class="cx">
</span><span class="cx"> if (isMainThread())
</span><span class="cx"> blobRegistry().unregisterBlobURL(url);
</span><del>- else
- callOnMainThread(&unregisterBlobURLTask, new BlobRegistryContext(url));
</del><ins>+ else {
+ // BlobRegistryContext performs an isolated copy of data.
+ BlobRegistryContext* context = new BlobRegistryContext(url);
+ callOnMainThread([context] {
+ std::unique_ptr<BlobRegistryContext> blobRegistryContext(context);
+ blobRegistry().unregisterBlobURL(blobRegistryContext->url);
+ });
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SecurityOrigin> ThreadableBlobRegistry::getCachedOrigin(const URL& url)
</span><span class="lines">@@ -198,24 +206,27 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long long ThreadableBlobRegistry::registerBlobURL(const URL&, Vector<BlobPart>, const String&)
</del><ins>+void ThreadableBlobRegistry::registerBlobURL(const URL&, Vector<BlobPart>, const String&)
</ins><span class="cx"> {
</span><del>- return 0;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableBlobRegistry::registerBlobURL(SecurityOrigin*, const URL&, const URL&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long long ThreadableBlobRegistry::registerBlobURLForSlice(const URL&, const URL&, long long, long long)
</del><ins>+void ThreadableBlobRegistry::registerBlobURLForSlice(const URL&, const URL&, long long, long long)
</ins><span class="cx"> {
</span><del>- return 0;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableBlobRegistry::unregisterBlobURL(const URL&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+unsigned long long ThreadableBlobRegistry::blobSize(const URL&)
+{
+ return 0;
+}
+
</ins><span class="cx"> PassRefPtr<SecurityOrigin> ThreadableBlobRegistry::getCachedOrigin(const URL&)
</span><span class="cx"> {
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiThreadableBlobRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.h (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.h 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.h 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -43,11 +43,12 @@
</span><span class="cx"> class ThreadableBlobRegistry {
</span><span class="cx"> public:
</span><span class="cx"> static void registerFileBlobURL(const URL&, const String& path, const String& contentType);
</span><del>- static unsigned long long registerBlobURL(const URL&, Vector<BlobPart> blobParts, const String& contentType);
</del><ins>+ static void registerBlobURL(const URL&, Vector<BlobPart> blobParts, const String& contentType);
</ins><span class="cx"> static void registerBlobURL(SecurityOrigin*, const URL&, const URL& srcURL);
</span><ins>+ static void registerBlobURLForSlice(const URL& newURL, const URL& srcURL, long long start, long long end);
</ins><span class="cx"> static void unregisterBlobURL(const URL&);
</span><span class="cx">
</span><del>- static unsigned long long registerBlobURLForSlice(const URL& newURL, const URL& srcURL, long long start, long long end);
</del><ins>+ static unsigned long long blobSize(const URL&);
</ins><span class="cx">
</span><span class="cx"> // Returns the origin for the given blob URL. This is because we are not able to embed the unique security origin or the origin of file URL
</span><span class="cx"> // in the blob URL.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobData.cpp (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobData.cpp 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebCore/platform/network/BlobData.cpp 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -69,7 +69,8 @@
</span><span class="cx">
</span><span class="cx"> void BlobData::appendData(PassRefPtr<RawData> data)
</span><span class="cx"> {
</span><del>- appendData(data, 0, data->length());
</del><ins>+ size_t dataSize = data->length();
+ appendData(data, 0, dataSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobData::appendData(PassRefPtr<RawData> data, long long offset, long long length)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistry.h (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistry.h 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebCore/platform/network/BlobRegistry.h 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -50,16 +50,18 @@
</span><span class="cx"> virtual void registerFileBlobURL(const URL&, const String& path, const String& contentType) = 0;
</span><span class="cx">
</span><span class="cx"> // Registers a blob URL referring to the specified blob data.
</span><del>- virtual unsigned long long registerBlobURL(const URL&, Vector<BlobPart>, const String& contentType) = 0;
</del><ins>+ virtual void registerBlobURL(const URL&, Vector<BlobPart>, const String& contentType) = 0;
</ins><span class="cx">
</span><span class="cx"> // Registers a new blob URL referring to the blob data identified by the specified srcURL.
</span><span class="cx"> virtual void registerBlobURL(const URL&, const URL& srcURL) = 0;
</span><span class="cx">
</span><span class="cx"> // Negative start and end values select from the end.
</span><del>- virtual unsigned long long registerBlobURLForSlice(const URL&, const URL& srcURL, long long start, long long end) = 0;
</del><ins>+ virtual void registerBlobURLForSlice(const URL&, const URL& srcURL, long long start, long long end) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void unregisterBlobURL(const URL&) = 0;
</span><span class="cx">
</span><ins>+ virtual unsigned long long blobSize(const URL&) = 0;
+
</ins><span class="cx"> virtual bool isBlobRegistryImpl() const { return false; }
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> m_blobs.set(url.string(), blobData.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long long BlobRegistryImpl::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
</del><ins>+void BlobRegistryImpl::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> registerBlobResourceHandleConstructor();
</span><span class="lines">@@ -142,20 +142,16 @@
</span><span class="cx"> // 3) The URL item is denoted by the URL, the range and the expected modification time.
</span><span class="cx"> // All the Blob items in the passing blob data are resolved and expanded into a set of Data and File items.
</span><span class="cx">
</span><del>- unsigned long long size = 0;
</del><span class="cx"> for (BlobPart& part : blobParts) {
</span><span class="cx"> switch (part.type()) {
</span><span class="cx"> case BlobPart::Data: {
</span><del>- unsigned long long partSize = part.data().size();
</del><span class="cx"> RefPtr<RawData> rawData = RawData::create(part.moveData());
</span><del>- size += partSize;
- blobData->appendData(rawData.release(), 0, partSize);
</del><ins>+ blobData->appendData(rawData.release());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case BlobPart::Blob: {
</span><span class="cx"> if (!m_blobs.contains(part.url().string()))
</span><del>- return 0;
- size += blobSize(part.url());
</del><ins>+ return;
</ins><span class="cx"> for (const BlobDataItem& item : m_blobs.get(part.url().string())->items())
</span><span class="cx"> blobData->m_items.append(item);
</span><span class="cx"> break;
</span><span class="lines">@@ -164,7 +160,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_blobs.set(url.string(), blobData.release());
</span><del>- return size;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryImpl::registerBlobURL(const URL& url, const URL& srcURL)
</span><span class="lines">@@ -178,12 +173,12 @@
</span><span class="cx"> m_blobs.set(url.string(), src);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long long BlobRegistryImpl::registerBlobURLForSlice(const URL& url, const URL& srcURL, long long start, long long end)
</del><ins>+void BlobRegistryImpl::registerBlobURLForSlice(const URL& url, const URL& srcURL, long long start, long long end)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> BlobData* originalData = getBlobDataFromURL(srcURL);
</span><span class="cx"> if (!originalData)
</span><del>- return 0;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> unsigned long long originalSize = blobSize(srcURL);
</span><span class="cx">
</span><span class="lines">@@ -213,7 +208,6 @@
</span><span class="cx"> appendStorageItems(newData.get(), originalData->items(), start, newLength);
</span><span class="cx">
</span><span class="cx"> m_blobs.set(url.string(), newData.release());
</span><del>- return newLength;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryImpl::unregisterBlobURL(const URL& url)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.h (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.h 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.h 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -58,13 +58,13 @@
</span><span class="cx"> void appendStorageItems(BlobData*, const BlobDataItemList&, long long offset, long long length);
</span><span class="cx">
</span><span class="cx"> virtual void registerFileBlobURL(const WebCore::URL&, const String& path, const String& contentType) override;
</span><del>- virtual unsigned long long registerBlobURL(const URL&, Vector<BlobPart>, const String& contentType) override;
</del><ins>+ virtual void registerBlobURL(const URL&, Vector<BlobPart>, const String& contentType) override;
</ins><span class="cx"> virtual void registerBlobURL(const URL&, const URL& srcURL) override;
</span><del>- virtual unsigned long long registerBlobURLForSlice(const URL&, const URL& srcURL, long long start, long long end) override;
</del><ins>+ virtual void registerBlobURLForSlice(const URL&, const URL& srcURL, long long start, long long end) override;
</ins><span class="cx"> virtual void unregisterBlobURL(const URL&) override;
</span><span class="cx"> virtual bool isBlobRegistryImpl() const override { return true; }
</span><span class="cx">
</span><del>- unsigned long long blobSize(const URL&);
</del><ins>+ virtual unsigned long long blobSize(const URL&) override;
</ins><span class="cx">
</span><span class="cx"> HashMap<String, RefPtr<BlobData>> m_blobs;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-05-07 Alexey Proskuryakov <ap@apple.com>
+
+ Make blob size computation lazy
+ https://bugs.webkit.org/show_bug.cgi?id=132653
+
+ Reviewed by Anders Carlsson.
+
+ * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
+ (WebKit::NetworkBlobRegistry::registerBlobURL):
+ (WebKit::NetworkBlobRegistry::registerBlobURLForSlice):
+ (WebKit::NetworkBlobRegistry::blobSize):
+ * NetworkProcess/FileAPI/NetworkBlobRegistry.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::registerBlobURL):
+ (WebKit::NetworkConnectionToWebProcess::registerBlobURLForSlice):
+ (WebKit::NetworkConnectionToWebProcess::blobSize):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * WebProcess/FileAPI/BlobRegistryProxy.cpp:
+ (WebKit::BlobRegistryProxy::registerBlobURL):
+ (WebKit::BlobRegistryProxy::registerBlobURLForSlice):
+ (WebKit::BlobRegistryProxy::blobSize):
+ * WebProcess/FileAPI/BlobRegistryProxy.h:
+
</ins><span class="cx"> 2014-05-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add scrolling tree logging to RemoteLayerTree output
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> mapIterator->value.add(url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t NetworkBlobRegistry::registerBlobURL(NetworkConnectionToWebProcess* connection, const URL& url, Vector<WebCore::BlobPart> blobParts, const String& contentType)
</del><ins>+void NetworkBlobRegistry::registerBlobURL(NetworkConnectionToWebProcess* connection, const URL& url, Vector<WebCore::BlobPart> blobParts, const String& contentType)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_sandboxExtensions.contains(url.string()));
</span><span class="cx">
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> sandboxExtensions.appendVector(m_sandboxExtensions.get(part.url().string()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t resultSize = blobRegistry().registerBlobURL(url, std::move(blobParts), contentType);
</del><ins>+ blobRegistry().registerBlobURL(url, std::move(blobParts), contentType);
</ins><span class="cx">
</span><span class="cx"> if (!sandboxExtensions.isEmpty())
</span><span class="cx"> m_sandboxExtensions.add(url.string(), std::move(sandboxExtensions));
</span><span class="lines">@@ -89,8 +89,6 @@
</span><span class="cx"> if (mapIterator == m_blobsForConnection.end())
</span><span class="cx"> mapIterator = m_blobsForConnection.add(connection, HashSet<URL>()).iterator;
</span><span class="cx"> mapIterator->value.add(url);
</span><del>-
- return resultSize;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkBlobRegistry::registerBlobURL(NetworkConnectionToWebProcess* connection, const WebCore::URL& url, const WebCore::URL& srcURL)
</span><span class="lines">@@ -105,9 +103,9 @@
</span><span class="cx"> m_blobsForConnection.find(connection)->value.add(url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t NetworkBlobRegistry::registerBlobURLForSlice(NetworkConnectionToWebProcess* connection, const WebCore::URL& url, const WebCore::URL& srcURL, int64_t start, int64_t end)
</del><ins>+void NetworkBlobRegistry::registerBlobURLForSlice(NetworkConnectionToWebProcess* connection, const WebCore::URL& url, const WebCore::URL& srcURL, int64_t start, int64_t end)
</ins><span class="cx"> {
</span><del>- uint64_t resultSize = blobRegistry().registerBlobURLForSlice(url, srcURL, start, end);
</del><ins>+ blobRegistry().registerBlobURLForSlice(url, srcURL, start, end);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Only store extensions for files that the slice actually contains, not for all the files in original blob.
</span><span class="cx"> SandboxExtensionMap::iterator iter = m_sandboxExtensions.find(srcURL.string());
</span><span class="lines">@@ -117,8 +115,6 @@
</span><span class="cx"> ASSERT(m_blobsForConnection.contains(connection));
</span><span class="cx"> ASSERT(m_blobsForConnection.find(connection)->value.contains(srcURL));
</span><span class="cx"> m_blobsForConnection.find(connection)->value.add(url);
</span><del>-
- return resultSize;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkBlobRegistry::unregisterBlobURL(NetworkConnectionToWebProcess* connection, const WebCore::URL& url)
</span><span class="lines">@@ -131,6 +127,14 @@
</span><span class="cx"> m_blobsForConnection.find(connection)->value.remove(url);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+uint64_t NetworkBlobRegistry::blobSize(NetworkConnectionToWebProcess* connection, const WebCore::URL& url)
+{
+ if (!m_blobsForConnection.contains(connection) || !m_blobsForConnection.find(connection)->value.contains(url))
+ return 0;
+
+ return blobRegistry().blobSize(url);
+}
+
</ins><span class="cx"> void NetworkBlobRegistry::connectionToWebProcessDidClose(NetworkConnectionToWebProcess* connection)
</span><span class="cx"> {
</span><span class="cx"> if (!m_blobsForConnection.contains(connection))
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -48,10 +48,11 @@
</span><span class="cx"> static NetworkBlobRegistry& shared();
</span><span class="cx">
</span><span class="cx"> void registerFileBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&, const String& path, PassRefPtr<SandboxExtension>, const String& contentType);
</span><del>- uint64_t registerBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&, Vector<WebCore::BlobPart>, const String& contentType);
</del><ins>+ void registerBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&, Vector<WebCore::BlobPart>, const String& contentType);
</ins><span class="cx"> void registerBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&, const WebCore::URL& srcURL);
</span><del>- uint64_t registerBlobURLForSlice(NetworkConnectionToWebProcess*, const WebCore::URL&, const WebCore::URL& srcURL, int64_t start, int64_t end);
</del><ins>+ void registerBlobURLForSlice(NetworkConnectionToWebProcess*, const WebCore::URL&, const WebCore::URL& srcURL, int64_t start, int64_t end);
</ins><span class="cx"> void unregisterBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&);
</span><ins>+ uint64_t blobSize(NetworkConnectionToWebProcess*, const WebCore::URL&);
</ins><span class="cx">
</span><span class="cx"> void connectionToWebProcessDidClose(NetworkConnectionToWebProcess*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -230,9 +230,9 @@
</span><span class="cx"> NetworkBlobRegistry::shared().registerFileBlobURL(this, url, path, extension.release(), contentType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkConnectionToWebProcess::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType, uint64_t& resultSize)
</del><ins>+void NetworkConnectionToWebProcess::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
</ins><span class="cx"> {
</span><del>- resultSize = NetworkBlobRegistry::shared().registerBlobURL(this, url, std::move(blobParts), contentType);
</del><ins>+ NetworkBlobRegistry::shared().registerBlobURL(this, url, std::move(blobParts), contentType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::registerBlobURLFromURL(const URL& url, const URL& srcURL)
</span><span class="lines">@@ -240,15 +240,20 @@
</span><span class="cx"> NetworkBlobRegistry::shared().registerBlobURL(this, url, srcURL);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkConnectionToWebProcess::registerBlobURLForSlice(const URL& url, const URL& srcURL, int64_t start, int64_t end, uint64_t& resultSize)
</del><ins>+void NetworkConnectionToWebProcess::registerBlobURLForSlice(const URL& url, const URL& srcURL, int64_t start, int64_t end)
</ins><span class="cx"> {
</span><del>- resultSize = NetworkBlobRegistry::shared().registerBlobURLForSlice(this, url, srcURL, start, end);
</del><ins>+ NetworkBlobRegistry::shared().registerBlobURLForSlice(this, url, srcURL, start, end);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::unregisterBlobURL(const URL& url)
</span><span class="cx"> {
</span><span class="cx"> NetworkBlobRegistry::shared().unregisterBlobURL(this, url);
</span><span class="cx"> }
</span><ins>+
+void NetworkConnectionToWebProcess::blobSize(const URL& url, uint64_t& resultSize)
+{
+ resultSize = NetworkBlobRegistry::shared().blobSize(this, url);
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -88,9 +88,10 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BLOB)
</span><span class="cx"> void registerFileBlobURL(const WebCore::URL&, const String& path, const SandboxExtension::Handle&, const String& contentType);
</span><del>- void registerBlobURL(const WebCore::URL&, Vector<WebCore::BlobPart>, const String& contentType, uint64_t& resultSize);
</del><ins>+ void registerBlobURL(const WebCore::URL&, Vector<WebCore::BlobPart>, const String& contentType);
</ins><span class="cx"> void registerBlobURLFromURL(const WebCore::URL&, const WebCore::URL& srcURL);
</span><del>- void registerBlobURLForSlice(const WebCore::URL&, const WebCore::URL& srcURL, int64_t start, int64_t end, uint64_t& resultSize);
</del><ins>+ void registerBlobURLForSlice(const WebCore::URL&, const WebCore::URL& srcURL, int64_t start, int64_t end);
+ void blobSize(const WebCore::URL&, uint64_t& resultSize);
</ins><span class="cx"> void unregisterBlobURL(const WebCore::URL&);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -45,10 +45,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BLOB)
</span><span class="cx"> RegisterFileBlobURL(WebCore::URL url, String path, WebKit::SandboxExtension::Handle extensionHandle, String contentType)
</span><del>- RegisterBlobURL(WebCore::URL url, Vector<WebCore::BlobPart> blobParts, String contentType) -> (uint64_t resultSize)
</del><ins>+ RegisterBlobURL(WebCore::URL url, Vector<WebCore::BlobPart> blobParts, String contentType)
</ins><span class="cx"> RegisterBlobURLFromURL(WebCore::URL url, WebCore::URL srcURL)
</span><del>- RegisterBlobURLForSlice(WebCore::URL url, WebCore::URL srcURL, int64_t start, int64_t end) -> (uint64_t resultSize)
</del><ins>+ RegisterBlobURLForSlice(WebCore::URL url, WebCore::URL srcURL, int64_t start, int64_t end)
</ins><span class="cx"> UnregisterBlobURL(WebCore::URL url)
</span><ins>+ BlobSize(WebCore::URL url) -> (uint64_t resultSize)
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -50,14 +50,11 @@
</span><span class="cx"> WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterFileBlobURL(url, path, extensionHandle, contentType), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long long BlobRegistryProxy::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
</del><ins>+void BlobRegistryProxy::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(WebProcess::shared().usesNetworkProcess());
</span><span class="cx">
</span><del>- uint64_t resultSize;
- if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::RegisterBlobURL(url, blobParts, contentType), Messages::NetworkConnectionToWebProcess::RegisterBlobURL::Reply(resultSize), 0))
- return 0;
- return resultSize;
</del><ins>+ WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURL(url, blobParts, contentType), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryProxy::registerBlobURL(const URL& url, const URL& srcURL)
</span><span class="lines">@@ -74,12 +71,19 @@
</span><span class="cx"> WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::UnregisterBlobURL(url), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long long BlobRegistryProxy::registerBlobURLForSlice(const URL& url, const URL& srcURL, long long start, long long end)
</del><ins>+void BlobRegistryProxy::registerBlobURLForSlice(const URL& url, const URL& srcURL, long long start, long long end)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(WebProcess::shared().usesNetworkProcess());
</span><span class="cx">
</span><ins>+ WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLForSlice(url, srcURL, start, end), 0);
+}
+
+unsigned long long BlobRegistryProxy::blobSize(const URL& url)
+{
+ ASSERT(WebProcess::shared().usesNetworkProcess());
+
</ins><span class="cx"> uint64_t resultSize;
</span><del>- if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::RegisterBlobURLForSlice(url, srcURL, start, end), Messages::NetworkConnectionToWebProcess::RegisterBlobURLForSlice::Reply(resultSize), 0))
</del><ins>+ if (!WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::BlobSize(url), Messages::NetworkConnectionToWebProcess::BlobSize::Reply(resultSize), 0))
</ins><span class="cx"> return 0;
</span><span class="cx"> return resultSize;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h (168434 => 168435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h 2014-05-07 18:49:26 UTC (rev 168434)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h 2014-05-07 18:57:35 UTC (rev 168435)
</span><span class="lines">@@ -35,10 +35,11 @@
</span><span class="cx"> class BlobRegistryProxy final : public WebCore::BlobRegistry {
</span><span class="cx"> public:
</span><span class="cx"> virtual void registerFileBlobURL(const WebCore::URL&, const String& path, const String& contentType) override;
</span><del>- virtual unsigned long long registerBlobURL(const WebCore::URL&, Vector<WebCore::BlobPart>, const String& contentType) override;
</del><ins>+ virtual void registerBlobURL(const WebCore::URL&, Vector<WebCore::BlobPart>, const String& contentType) override;
</ins><span class="cx"> virtual void registerBlobURL(const WebCore::URL&, const WebCore::URL& srcURL) override;
</span><span class="cx"> virtual void unregisterBlobURL(const WebCore::URL&) override;
</span><del>- virtual unsigned long long registerBlobURLForSlice(const WebCore::URL&, const WebCore::URL& srcURL, long long start, long long end) override;
</del><ins>+ virtual void registerBlobURLForSlice(const WebCore::URL&, const WebCore::URL& srcURL, long long start, long long end) override;
+ virtual unsigned long long blobSize(const WebCore::URL&) override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>