<!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>[201636] 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/201636">201636</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-02 22:38:44 -0700 (Thu, 02 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop BlobRegistryContext class as it is no longer needed
https://bugs.webkit.org/show_bug.cgi?id=158328
Reviewed by Brady Eidson.
Drop BlobRegistryContext class as it is no longer needed. We can now
call isolatedCopy() as we capture in the lambda.
* fileapi/ThreadableBlobRegistry.cpp:
(WebCore::ThreadableBlobRegistry::registerFileBlobURL):
(WebCore::ThreadableBlobRegistry::registerBlobURL):
(WebCore::ThreadableBlobRegistry::registerBlobURLForSlice):
(WebCore::ThreadableBlobRegistry::blobSize):
(WebCore::ThreadableBlobRegistry::unregisterBlobURL):
(WebCore::BlobRegistryContext::BlobRegistryContext): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorefileapiThreadableBlobRegistrycpp">trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201635 => 201636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-03 05:27:53 UTC (rev 201635)
+++ trunk/Source/WebCore/ChangeLog 2016-06-03 05:38:44 UTC (rev 201636)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-06-02 Chris Dumez <cdumez@apple.com>
+
+ Drop BlobRegistryContext class as it is no longer needed
+ https://bugs.webkit.org/show_bug.cgi?id=158328
+
+ Reviewed by Brady Eidson.
+
+ Drop BlobRegistryContext class as it is no longer needed. We can now
+ call isolatedCopy() as we capture in the lambda.
+
+ * fileapi/ThreadableBlobRegistry.cpp:
+ (WebCore::ThreadableBlobRegistry::registerFileBlobURL):
+ (WebCore::ThreadableBlobRegistry::registerBlobURL):
+ (WebCore::ThreadableBlobRegistry::registerBlobURLForSlice):
+ (WebCore::ThreadableBlobRegistry::blobSize):
+ (WebCore::ThreadableBlobRegistry::unregisterBlobURL):
+ (WebCore::BlobRegistryContext::BlobRegistryContext): Deleted.
+
</ins><span class="cx"> 2016-06-02 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Repaint issue with vertical text in an out of flow container.
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiThreadableBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp (201635 => 201636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2016-06-03 05:27:53 UTC (rev 201635)
+++ trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2016-06-03 05:38:44 UTC (rev 201636)
</span><span class="lines">@@ -51,43 +51,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-struct BlobRegistryContext {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- BlobRegistryContext(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
- : url(url.isolatedCopy())
- , contentType(contentType.isolatedCopy())
- , blobParts(WTFMove(blobParts))
- {
- for (BlobPart& part : blobParts)
- part.detachFromCurrentThread();
- }
-
- BlobRegistryContext(const URL& url, const URL& srcURL)
- : url(url.isolatedCopy())
- , srcURL(srcURL.isolatedCopy())
- {
- }
-
- BlobRegistryContext(const URL& url)
- : url(url.isolatedCopy())
- {
- }
-
- BlobRegistryContext(const URL& url, const String& path, const String& contentType)
- : url(url.isolatedCopy())
- , path(path.isolatedCopy())
- , contentType(contentType.isolatedCopy())
- {
- }
-
- URL url;
- URL srcURL;
- String path;
- String contentType;
- Vector<BlobPart> blobParts;
-};
-
</del><span class="cx"> typedef HashMap<String, RefPtr<SecurityOrigin>> BlobUrlOriginMap;
</span><span class="cx">
</span><span class="cx"> static ThreadSpecific<BlobUrlOriginMap>& originMap()
</span><span class="lines">@@ -117,9 +80,8 @@
</span><span class="cx"> if (isMainThread())
</span><span class="cx"> blobRegistry().registerFileBlobURL(url, BlobDataFileReference::create(path), contentType);
</span><span class="cx"> else {
</span><del>- // BlobRegistryContext performs an isolated copy of data.
- callOnMainThread([context = std::make_unique<BlobRegistryContext>(url, path, contentType)] {
- blobRegistry().registerFileBlobURL(context->url, BlobDataFileReference::create(context->path), context->contentType);
</del><ins>+ callOnMainThread([url = url.isolatedCopy(), path = path.isolatedCopy(), contentType = contentType.isolatedCopy()] {
+ blobRegistry().registerFileBlobURL(url, BlobDataFileReference::create(path), contentType);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -129,9 +91,10 @@
</span><span class="cx"> if (isMainThread())
</span><span class="cx"> blobRegistry().registerBlobURL(url, WTFMove(blobParts), contentType);
</span><span class="cx"> else {
</span><del>- // BlobRegistryContext performs an isolated copy of data.
- callOnMainThread([context = std::make_unique<BlobRegistryContext>(url, WTFMove(blobParts), contentType)] {
- blobRegistry().registerBlobURL(context->url, WTFMove(context->blobParts), context->contentType);
</del><ins>+ for (auto& part : blobParts)
+ part.detachFromCurrentThread();
+ callOnMainThread([url = url.isolatedCopy(), blobParts = WTFMove(blobParts), contentType = contentType.isolatedCopy()]() mutable {
+ blobRegistry().registerBlobURL(url, WTFMove(blobParts), contentType);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -145,9 +108,8 @@
</span><span class="cx"> if (isMainThread())
</span><span class="cx"> blobRegistry().registerBlobURL(url, srcURL);
</span><span class="cx"> else {
</span><del>- // BlobRegistryContext performs an isolated copy of data.
- callOnMainThread([context = std::make_unique<BlobRegistryContext>(url, srcURL)] {
- blobRegistry().registerBlobURL(context->url, context->srcURL);
</del><ins>+ callOnMainThread([url = url.isolatedCopy(), srcURL = srcURL.isolatedCopy()] {
+ blobRegistry().registerBlobURL(url, srcURL);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -172,9 +134,8 @@
</span><span class="cx"> if (isMainThread())
</span><span class="cx"> blobRegistry().registerBlobURLForSlice(newURL, srcURL, start, end);
</span><span class="cx"> else {
</span><del>- // BlobRegistryContext performs an isolated copy of data.
- callOnMainThread([context = std::make_unique<BlobRegistryContext>(newURL, srcURL), start, end] {
- blobRegistry().registerBlobURLForSlice(context->url, context->srcURL, start, end);
</del><ins>+ callOnMainThread([newURL = newURL.isolatedCopy(), srcURL = srcURL.isolatedCopy(), start, end] {
+ blobRegistry().registerBlobURLForSlice(newURL, srcURL, start, end);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -185,10 +146,9 @@
</span><span class="cx"> if (isMainThread())
</span><span class="cx"> resultSize = blobRegistry().blobSize(url);
</span><span class="cx"> else {
</span><del>- // BlobRegistryContext performs an isolated copy of data.
</del><span class="cx"> BinarySemaphore semaphore;
</span><del>- callOnMainThread([context = std::make_unique<BlobRegistryContext>(url), &semaphore, &resultSize] {
- resultSize = blobRegistry().blobSize(context->url);
</del><ins>+ callOnMainThread([url = url.isolatedCopy(), &semaphore, &resultSize] {
+ resultSize = blobRegistry().blobSize(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">@@ -204,9 +164,8 @@
</span><span class="cx"> if (isMainThread())
</span><span class="cx"> blobRegistry().unregisterBlobURL(url);
</span><span class="cx"> else {
</span><del>- // BlobRegistryContext performs an isolated copy of data.
- callOnMainThread([context = std::make_unique<BlobRegistryContext>(url)] {
- blobRegistry().unregisterBlobURL(context->url);
</del><ins>+ callOnMainThread([url = url.isolatedCopy()] {
+ blobRegistry().unregisterBlobURL(url);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>