<!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>[171708] 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/171708">171708</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-28 16:14:04 -0700 (Mon, 28 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION(168376): Standalone images pasted to Outlook 2011 don't display
&lt;rdar://problem/17768371&gt; and https://bugs.webkit.org/show_bug.cgi?id=135363

Reviewed by Tim Horton.

Outlook isn’t prepared to handle the resource load callbacks when sent synchronously.

<a href="http://trac.webkit.org/projects/webkit/changeset/168376">r168376</a> was an optimization that we no longer need, so the simplest fix is to roll it out.

* editing/mac/EditorMac.mm:
(WebCore::Editor::WebContentReader::readImage):

* loader/archive/ArchiveResource.cpp:
(WebCore::ArchiveResource::ArchiveResource):
* loader/archive/ArchiveResource.h:
(WebCore::ArchiveResource::setShouldLoadImmediately): Deleted.
(WebCore::ArchiveResource::shouldLoadImmediately): Deleted.

* 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 (171707 => 171708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-07-28 22:47:24 UTC (rev 171707)
+++ trunk/Source/WebCore/ChangeLog        2014-07-28 23:14:04 UTC (rev 171708)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-07-28  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        REGRESSION(168376): Standalone images pasted to Outlook 2011 don't display
+        &lt;rdar://problem/17768371&gt; and https://bugs.webkit.org/show_bug.cgi?id=135363
+
+        Reviewed by Tim Horton.
+
+        Outlook isn’t prepared to handle the resource load callbacks when sent synchronously.
+
+        r168376 was an optimization that we no longer need, so the simplest fix is to roll it out.
+
+        * editing/mac/EditorMac.mm:
+        (WebCore::Editor::WebContentReader::readImage):
+
+        * loader/archive/ArchiveResource.cpp:
+        (WebCore::ArchiveResource::ArchiveResource):
+        * loader/archive/ArchiveResource.h:
+        (WebCore::ArchiveResource::setShouldLoadImmediately): Deleted.
+        (WebCore::ArchiveResource::shouldLoadImmediately): Deleted.
+
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::requestResource):
+
</ins><span class="cx"> 2014-07-28  Mark Hahnenberg  &lt;mhahnenberg@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         ASSERTION FAILED: m_heap-&gt;vm()-&gt;currentThreadIsHoldingAPILock()
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (171707 => 171708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm        2014-07-28 22:47:24 UTC (rev 171707)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm        2014-07-28 23:14:04 UTC (rev 171708)
</span><span class="lines">@@ -583,10 +583,7 @@
</span><span class="cx">     typeAsFilenameWithExtension.replace('/', '.');
</span><span class="cx">     URL imageURL = URL::fakeURLWithRelativePart(typeAsFilenameWithExtension);
</span><span class="cx"> 
</span><del>-    RefPtr&lt;ArchiveResource&gt; archiveResource = ArchiveResource::create(buffer, imageURL, type, emptyString(), emptyString());
-    archiveResource-&gt;setShouldLoadImmediately(true);
-
-    fragment = frame.editor().createFragmentForImageResourceAndAddResource(archiveResource.release());
</del><ins>+    fragment = frame.editor().createFragmentForImageResourceAndAddResource(ArchiveResource::create(buffer, imageURL, type, emptyString(), emptyString()));
</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 (171707 => 171708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/ArchiveResource.cpp        2014-07-28 22:47:24 UTC (rev 171707)
+++ trunk/Source/WebCore/loader/archive/ArchiveResource.cpp        2014-07-28 23:14:04 UTC (rev 171708)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx">     , m_textEncoding(textEncoding)
</span><span class="cx">     , m_frameName(frameName)
</span><span class="cx">     , m_shouldIgnoreWhenUnarchiving(false)
</span><del>-    , m_shouldLoadImmediately(false)
</del><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 (171707 => 171708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/ArchiveResource.h        2014-07-28 22:47:24 UTC (rev 171707)
+++ trunk/Source/WebCore/loader/archive/ArchiveResource.h        2014-07-28 23:14:04 UTC (rev 171708)
</span><span class="lines">@@ -47,9 +47,6 @@
</span><span class="cx">     void ignoreWhenUnarchiving() { m_shouldIgnoreWhenUnarchiving = true; }
</span><span class="cx">     bool shouldIgnoreWhenUnarchiving() const { return m_shouldIgnoreWhenUnarchiving; }
</span><span class="cx"> 
</span><del>-    void setShouldLoadImmediately(bool shouldLoadImmediately) { m_shouldLoadImmediately = shouldLoadImmediately; }
-    bool shouldLoadImmediately() const { return m_shouldLoadImmediately; }
-
</del><span class="cx"> private:
</span><span class="cx">     ArchiveResource(PassRefPtr&lt;SharedBuffer&gt;, const URL&amp;, const String&amp; mimeType, const String&amp; textEncoding, const String&amp; frameName, const ResourceResponse&amp;);
</span><span class="cx"> 
</span><span class="lines">@@ -58,7 +55,6 @@
</span><span class="cx">     String m_frameName;
</span><span class="cx"> 
</span><span class="cx">     bool m_shouldIgnoreWhenUnarchiving;
</span><del>-    bool m_shouldLoadImmediately;
</del><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 (171707 => 171708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2014-07-28 22:47:24 UTC (rev 171707)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2014-07-28 23:14:04 UTC (rev 171708)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;CachedResourceLoader.h&quot;
</span><span class="cx"> 
</span><del>-#include &quot;ArchiveResource.h&quot;
</del><span class="cx"> #include &quot;CachedCSSStyleSheet.h&quot;
</span><span class="cx"> #include &quot;CachedSVGDocument.h&quot;
</span><span class="cx"> #include &quot;CachedFont.h&quot;
</span><span class="lines">@@ -52,7 +51,6 @@
</span><span class="cx"> #include &quot;PingLoader.h&quot;
</span><span class="cx"> #include &quot;PlatformStrategies.h&quot;
</span><span class="cx"> #include &quot;RenderElement.h&quot;
</span><del>-#include &quot;ResourceBuffer.h&quot;
</del><span class="cx"> #include &quot;ResourceLoadScheduler.h&quot;
</span><span class="cx"> #include &quot;ScriptController.h&quot;
</span><span class="cx"> #include &quot;SecurityOrigin.h&quot;
</span><span class="lines">@@ -471,17 +469,9 @@
</span><span class="cx">         resource-&gt;setLoadPriority(request.priority());
</span><span class="cx"> 
</span><span class="cx">     if ((policy != Use || resource-&gt;stillNeedsLoad()) &amp;&amp; CachedResourceRequest::NoDefer == request.defer()) {
</span><del>-        ArchiveResource* archiveResource = m_documentLoader ? m_documentLoader-&gt;archiveResourceForURL(request.resourceRequest().url()) : nullptr;
</del><ins>+        resource-&gt;load(this, request.options());
</ins><span class="cx"> 
</span><del>-        if (archiveResource &amp;&amp; archiveResource-&gt;shouldLoadImmediately()) {
-            resource-&gt;responseReceived(resource-&gt;response());
-            RefPtr&lt;ResourceBuffer&gt; buffer = ResourceBuffer::adoptSharedBuffer(archiveResource-&gt;data());
-            resource-&gt;finishLoading(buffer.get());
-            resource-&gt;finish();
-        } else
-            resource-&gt;load(this, request.options());
-
-        // We only sometimes support immediate loads, but we always support immediate failure.
</del><ins>+        // We don't support immediate loads, but we do support immediate failure.
</ins><span class="cx">         if (resource-&gt;errorOccurred()) {
</span><span class="cx">             if (resource-&gt;inCache())
</span><span class="cx">                 memoryCache()-&gt;remove(resource.get());
</span></span></pre>
</div>
</div>

</body>
</html>