<!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>[203482] 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/203482">203482</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-20 17:23:19 -0700 (Wed, 20 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>iOS: Cannot paste images in RTF content
https://bugs.webkit.org/show_bug.cgi?id=159964
<rdar://problem/27442806>
Reviewed by Enrica Casucci.
The bug was caused by setDefersLoading(true) not deferring image loading for the parsed fragment.
Worked around this bug by disabling image loading while parsing the document fragment.
* editing/ios/EditorIOS.mm:
(WebCore::Editor::createFragmentAndAddResources):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingiosEditorIOSmm">trunk/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoaderh">trunk/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203481 => 203482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-21 00:15:58 UTC (rev 203481)
+++ trunk/Source/WebCore/ChangeLog 2016-07-21 00:23:19 UTC (rev 203482)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-07-19 Ryosuke Niwa <rniwa@webkit.org>
+
+ iOS: Cannot paste images in RTF content
+ https://bugs.webkit.org/show_bug.cgi?id=159964
+ <rdar://problem/27442806>
+
+ Reviewed by Enrica Casucci.
+
+ The bug was caused by setDefersLoading(true) not deferring image loading for the parsed fragment.
+ Worked around this bug by disabling image loading while parsing the document fragment.
+
+ * editing/ios/EditorIOS.mm:
+ (WebCore::Editor::createFragmentAndAddResources):
+
</ins><span class="cx"> 2016-07-20 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Address a small FIXME in IDB code.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ios/EditorIOS.mm (203481 => 203482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ios/EditorIOS.mm 2016-07-21 00:15:58 UTC (rev 203481)
+++ trunk/Source/WebCore/editing/ios/EditorIOS.mm 2016-07-21 00:23:19 UTC (rev 203482)
</span><span class="lines">@@ -26,9 +26,10 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Editor.h"
</span><span class="cx">
</span><del>-#include "CachedImage.h"
</del><span class="cx"> #include "CSSComputedStyleDeclaration.h"
</span><span class="cx"> #include "CSSPrimitiveValueMappings.h"
</span><ins>+#include "CachedImage.h"
+#include "CachedResourceLoader.h"
</ins><span class="cx"> #include "DOMRangeInternal.h"
</span><span class="cx"> #include "DataTransfer.h"
</span><span class="cx"> #include "DocumentFragment.h"
</span><span class="lines">@@ -549,10 +550,11 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<DocumentFragment> Editor::createFragmentAndAddResources(NSAttributedString *string)
</span><span class="cx"> {
</span><del>- if (!m_frame.page() || !m_frame.document() || !m_frame.document()->isHTMLDocument())
</del><ins>+ if (!m_frame.page() || !m_frame.document())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (!string)
</del><ins>+ auto& document = *m_frame.document();
+ if (!document.isHTMLDocument() || !string)
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> bool wasDeferringCallbacks = m_frame.page()->defersLoading();
</span><span class="lines">@@ -559,6 +561,11 @@
</span><span class="cx"> if (!wasDeferringCallbacks)
</span><span class="cx"> m_frame.page()->setDefersLoading(true);
</span><span class="cx">
</span><ins>+ auto& cachedResourceLoader = document.cachedResourceLoader();
+ bool wasImagesEnabled = cachedResourceLoader.imagesEnabled();
+ if (wasImagesEnabled)
+ cachedResourceLoader.setImagesEnabled(false);
+
</ins><span class="cx"> Vector<RefPtr<ArchiveResource>> resources;
</span><span class="cx"> RefPtr<DocumentFragment> fragment = client()->documentFragmentFromAttributedString(string, resources);
</span><span class="cx">
</span><span class="lines">@@ -569,6 +576,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (wasImagesEnabled)
+ cachedResourceLoader.setImagesEnabled(true);
</ins><span class="cx"> if (!wasDeferringCallbacks)
</span><span class="cx"> m_frame.page()->setDefersLoading(false);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (203481 => 203482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2016-07-21 00:15:58 UTC (rev 203481)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2016-07-21 00:23:19 UTC (rev 203482)
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx"> bool autoLoadImages() const { return m_autoLoadImages; }
</span><span class="cx"> void setAutoLoadImages(bool);
</span><span class="cx">
</span><ins>+ bool imagesEnabled() const { return m_imagesEnabled; }
</ins><span class="cx"> void setImagesEnabled(bool);
</span><span class="cx">
</span><span class="cx"> bool shouldDeferImageLoad(const URL&) const;
</span></span></pre>
</div>
</div>
</body>
</html>