<!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>[168376] 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/168376">168376</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-05-06 13:10:01 -0700 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>"Flash of content without image" when pasting a raw image from the pasteboard
<rdar://problem/16826199> and https://bugs.webkit.org/show_bug.cgi?id=132612
Reviewed by Tim Horton.
Let an ArchiveResource be flagged as "should load immediately":
* loader/archive/ArchiveResource.cpp:
(WebCore::ArchiveResource::ArchiveResource):
* loader/archive/ArchiveResource.h:
(WebCore::ArchiveResource::setShouldLoadImmediately):
(WebCore::ArchiveResource::shouldLoadImmediately):
Set that flag on the ArchiveResource for the image.
Note we quite explicitly do this only in the "read a single image" from the pasteboard
case, because we don't want to do this synchronous step for multiple images at once
such as when pasting a WebArchive:
* editing/mac/EditorMac.mm:
(WebCore::Editor::WebContentReader::readImage):
When creating a new CachedResource, if there is an ArchiveResource that is set to
load immediately, populate the CachedResource immediately instead of scheduling a load:
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestResource):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreloaderarchiveArchiveResourcecpp">trunk/Source/WebCore/loader/archive/ArchiveResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchiveArchiveResourceh">trunk/Source/WebCore/loader/archive/ArchiveResource.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168375 => 168376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-06 19:48:53 UTC (rev 168375)
+++ trunk/Source/WebCore/ChangeLog 2014-05-06 20:10:01 UTC (rev 168376)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-05-06 Brady Eidson <beidson@apple.com>
+
+ "Flash of content without image" when pasting a raw image from the pasteboard
+ <rdar://problem/16826199> and https://bugs.webkit.org/show_bug.cgi?id=132612
+
+ Reviewed by Tim Horton.
+
+ Let an ArchiveResource be flagged as "should load immediately":
+ * loader/archive/ArchiveResource.cpp:
+ (WebCore::ArchiveResource::ArchiveResource):
+ * loader/archive/ArchiveResource.h:
+ (WebCore::ArchiveResource::setShouldLoadImmediately):
+ (WebCore::ArchiveResource::shouldLoadImmediately):
+
+ Set that flag on the ArchiveResource for the image.
+ Note we quite explicitly do this only in the "read a single image" from the pasteboard
+ case, because we don't want to do this synchronous step for multiple images at once
+ such as when pasting a WebArchive:
+ * editing/mac/EditorMac.mm:
+ (WebCore::Editor::WebContentReader::readImage):
+
+ When creating a new CachedResource, if there is an ArchiveResource that is set to
+ load immediately, populate the CachedResource immediately instead of scheduling a load:
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestResource):
+
</ins><span class="cx"> 2014-05-06 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for debug after r168367.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (168375 => 168376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2014-05-06 19:48:53 UTC (rev 168375)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2014-05-06 20:10:01 UTC (rev 168376)
</span><span class="lines">@@ -542,7 +542,10 @@
</span><span class="cx"> typeAsFilenameWithExtension.replace('/', '.');
</span><span class="cx"> URL imageURL = URL::fakeURLWithRelativePart(typeAsFilenameWithExtension);
</span><span class="cx">
</span><del>- fragment = frame.editor().createFragmentForImageResourceAndAddResource(ArchiveResource::create(buffer, imageURL, type, emptyString(), emptyString()));
</del><ins>+ RefPtr<ArchiveResource> archiveResource = ArchiveResource::create(buffer, imageURL, type, emptyString(), emptyString());
+ archiveResource->setShouldLoadImmediately(true);
+
+ fragment = frame.editor().createFragmentForImageResourceAndAddResource(archiveResource.release());
</ins><span class="cx"> return fragment;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchiveArchiveResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/ArchiveResource.cpp (168375 => 168376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/ArchiveResource.cpp 2014-05-06 19:48:53 UTC (rev 168375)
+++ trunk/Source/WebCore/loader/archive/ArchiveResource.cpp 2014-05-06 20:10:01 UTC (rev 168376)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> , m_textEncoding(textEncoding)
</span><span class="cx"> , m_frameName(frameName)
</span><span class="cx"> , m_shouldIgnoreWhenUnarchiving(false)
</span><ins>+ , m_shouldLoadImmediately(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchiveArchiveResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/ArchiveResource.h (168375 => 168376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/ArchiveResource.h 2014-05-06 19:48:53 UTC (rev 168375)
+++ trunk/Source/WebCore/loader/archive/ArchiveResource.h 2014-05-06 20:10:01 UTC (rev 168376)
</span><span class="lines">@@ -47,6 +47,9 @@
</span><span class="cx"> void ignoreWhenUnarchiving() { m_shouldIgnoreWhenUnarchiving = true; }
</span><span class="cx"> bool shouldIgnoreWhenUnarchiving() const { return m_shouldIgnoreWhenUnarchiving; }
</span><span class="cx">
</span><ins>+ void setShouldLoadImmediately(bool shouldLoadImmediately) { m_shouldLoadImmediately = shouldLoadImmediately; }
+ bool shouldLoadImmediately() const { return m_shouldLoadImmediately; }
+
</ins><span class="cx"> private:
</span><span class="cx"> ArchiveResource(PassRefPtr<SharedBuffer>, const URL&, const String& mimeType, const String& textEncoding, const String& frameName, const ResourceResponse&);
</span><span class="cx">
</span><span class="lines">@@ -55,6 +58,7 @@
</span><span class="cx"> String m_frameName;
</span><span class="cx">
</span><span class="cx"> bool m_shouldIgnoreWhenUnarchiving;
</span><ins>+ bool m_shouldLoadImmediately;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (168375 => 168376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-05-06 19:48:53 UTC (rev 168375)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-05-06 20:10:01 UTC (rev 168376)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx">
</span><ins>+#include "ArchiveResource.h"
</ins><span class="cx"> #include "CachedCSSStyleSheet.h"
</span><span class="cx"> #include "CachedSVGDocument.h"
</span><span class="cx"> #include "CachedFont.h"
</span><span class="lines">@@ -51,6 +52,7 @@
</span><span class="cx"> #include "PingLoader.h"
</span><span class="cx"> #include "PlatformStrategies.h"
</span><span class="cx"> #include "RenderElement.h"
</span><ins>+#include "ResourceBuffer.h"
</ins><span class="cx"> #include "ResourceLoadScheduler.h"
</span><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="lines">@@ -467,9 +469,17 @@
</span><span class="cx"> resource->setLoadPriority(request.priority());
</span><span class="cx">
</span><span class="cx"> if ((policy != Use || resource->stillNeedsLoad()) && CachedResourceRequest::NoDefer == request.defer()) {
</span><del>- resource->load(this, request.options());
</del><ins>+ ArchiveResource* archiveResource = m_documentLoader ? m_documentLoader->archiveResourceForURL(request.resourceRequest().url()) : nullptr;
</ins><span class="cx">
</span><del>- // We don't support immediate loads, but we do support immediate failure.
</del><ins>+ if (archiveResource && archiveResource->shouldLoadImmediately()) {
+ resource->responseReceived(resource->response());
+ RefPtr<ResourceBuffer> buffer = ResourceBuffer::adoptSharedBuffer(archiveResource->data());
+ resource->finishLoading(buffer.get());
+ resource->finish();
+ } else
+ resource->load(this, request.options());
+
+ // We only sometimes support immediate loads, but we always support immediate failure.
</ins><span class="cx"> if (resource->errorOccurred()) {
</span><span class="cx"> if (resource->inCache())
</span><span class="cx"> memoryCache()->remove(resource.get());
</span></span></pre>
</div>
</div>
</body>
</html>