<!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>[208451] trunk</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/208451">208451</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-11-09 11:14:17 -0800 (Wed, 09 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use Blob URL instead of webkit-fake-url when pasting an image
https://bugs.webkit.org/show_bug.cgi?id=49141
Reviewed by Darin Adler.
Source/WebCore:
Use Blob URL instead of webkit-fake-url when pasting an image.
Tests: editing/pasteboard/paste-image-as-blob-url.html
editing/pasteboard/paste-image-using-image-data.html
* editing/Editor.h:
* editing/mac/EditorMac.mm:
(WebCore::Editor::WebContentReader::readImage):
(WebCore::Editor::createFragmentForImageAndURL):
LayoutTests:
Add layout test coverage checking that the image shows as expected and that the
resulting URL is indeed a Blob URL.
* editing/pasteboard/paste-image-as-blob-url-expected.txt: Added.
* editing/pasteboard/paste-image-as-blob-url.html: Added.
* editing/pasteboard/paste-image-using-image-data-expected.html: Added.
* editing/pasteboard/paste-image-using-image-data.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</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="#trunkSourceWebCoreplatformnetworkBlobParth">trunk/Source/WebCore/platform/network/BlobPart.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingpasteboardpasteimageasbloburlexpectedtxt">trunk/LayoutTests/editing/pasteboard/paste-image-as-blob-url-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardpasteimageasbloburlhtml">trunk/LayoutTests/editing/pasteboard/paste-image-as-blob-url.html</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardpasteimageusingimagedataexpectedhtml">trunk/LayoutTests/editing/pasteboard/paste-image-using-image-data-expected.html</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardpasteimageusingimagedatahtml">trunk/LayoutTests/editing/pasteboard/paste-image-using-image-data.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208450 => 208451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-09 19:10:42 UTC (rev 208450)
+++ trunk/LayoutTests/ChangeLog 2016-11-09 19:14:17 UTC (rev 208451)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-11-09 Chris Dumez <cdumez@apple.com>
+
+ Use Blob URL instead of webkit-fake-url when pasting an image
+ https://bugs.webkit.org/show_bug.cgi?id=49141
+
+ Reviewed by Darin Adler.
+
+ Add layout test coverage checking that the image shows as expected and that the
+ resulting URL is indeed a Blob URL.
+
+ * editing/pasteboard/paste-image-as-blob-url-expected.txt: Added.
+ * editing/pasteboard/paste-image-as-blob-url.html: Added.
+ * editing/pasteboard/paste-image-using-image-data-expected.html: Added.
+ * editing/pasteboard/paste-image-using-image-data.html: Added.
+
</ins><span class="cx"> 2016-11-07 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] The implementation of 8 bit operation in MacroAssembler should care about uint8_t / int8_t
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardpasteimageasbloburlexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/pasteboard/paste-image-as-blob-url-expected.txt (0 => 208451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/paste-image-as-blob-url-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-image-as-blob-url-expected.txt 2016-11-09 19:14:17 UTC (rev 208451)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Tests that pasted images use blob URL, not webkit fake URLs.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS pastedImages.length is 1
+PASS url.protocol is "blob:"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardpasteimageasbloburlhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/pasteboard/paste-image-as-blob-url.html (0 => 208451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/paste-image-as-blob-url.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-image-as-blob-url.html 2016-11-09 19:14:17 UTC (rev 208451)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<div id="destination" contenteditable="true" style="width: 500px; height: 100px; border: solid red 1px"></div>
+<iframe id="iframe" src="../resources/abe.png" onload="selectInFrame()"></iframe>
+</body>
+<script>
+ description("Tests that pasted images use blob URL, not webkit fake URLs.");
+ jsTestIsAsync = true;
+
+ function selectInFrame() {
+ if (window.internals)
+ window.internals.settings.setPreferMIMETypeForImages(true);
+ var iframe = document.getElementById("iframe");
+ var iframeDocument = iframe.contentDocument;
+ var destination = document.getElementById("destination");
+ iframeDocument.body.focus();
+ iframeDocument.execCommand("SelectAll");
+ iframeDocument.execCommand("Copy");
+ destination.focus();
+ document.execCommand("Paste");
+
+ pastedImages = destination.getElementsByTagName("img");
+ shouldBe("pastedImages.length", "1");
+ img = pastedImages[0];
+ url = new URL(img.src);
+ shouldBeEqualToString("url.protocol", "blob:");
+
+ finishJSTest();
+ }
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardpasteimageusingimagedataexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/pasteboard/paste-image-using-image-data-expected.html (0 => 208451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/paste-image-using-image-data-expected.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-image-using-image-data-expected.html 2016-11-09 19:14:17 UTC (rev 208451)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<div id="destination" contenteditable="true" style="width: 500px; height: 100px; border: solid red 1px">
+<img src="../resources/abe.png">
+</div>
+<iframe id="iframe" src="../resources/abe.png"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardpasteimageusingimagedatahtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/pasteboard/paste-image-using-image-data.html (0 => 208451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/paste-image-using-image-data.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-image-using-image-data.html 2016-11-09 19:14:17 UTC (rev 208451)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<div id="destination" contenteditable="true" style="width: 500px; height: 100px; border: solid red 1px"></div>
+<iframe id="iframe" src="../resources/abe.png" onload="selectInFrame()"></iframe>
+</body>
+<script>
+ function selectInFrame() {
+ if (window.internals)
+ window.internals.settings.setPreferMIMETypeForImages(true);
+ var iframe = document.getElementById("iframe");
+ var iframeDocument = iframe.contentDocument;
+ var destination = document.getElementById("destination");
+ iframeDocument.body.focus();
+ iframeDocument.execCommand("SelectAll");
+ iframeDocument.execCommand("Copy");
+ destination.focus();
+ document.execCommand("Paste");
+ destination.blur();
+ }
+</script>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208450 => 208451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-09 19:10:42 UTC (rev 208450)
+++ trunk/Source/WebCore/ChangeLog 2016-11-09 19:14:17 UTC (rev 208451)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-11-09 Chris Dumez <cdumez@apple.com>
+
+ Use Blob URL instead of webkit-fake-url when pasting an image
+ https://bugs.webkit.org/show_bug.cgi?id=49141
+
+ Reviewed by Darin Adler.
+
+ Use Blob URL instead of webkit-fake-url when pasting an image.
+
+ Tests: editing/pasteboard/paste-image-as-blob-url.html
+ editing/pasteboard/paste-image-using-image-data.html
+
+ * editing/Editor.h:
+ * editing/mac/EditorMac.mm:
+ (WebCore::Editor::WebContentReader::readImage):
+ (WebCore::Editor::createFragmentForImageAndURL):
+
</ins><span class="cx"> 2016-11-09 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Fix error message when SQLite initialization fails
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (208450 => 208451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2016-11-09 19:10:42 UTC (rev 208450)
+++ trunk/Source/WebCore/editing/Editor.h 2016-11-09 19:14:17 UTC (rev 208451)
</span><span class="lines">@@ -518,6 +518,7 @@
</span><span class="cx"> RefPtr<SharedBuffer> imageInWebArchiveFormat(Element&);
</span><span class="cx"> RefPtr<Range> adjustedSelectionRange();
</span><span class="cx"> RefPtr<DocumentFragment> createFragmentForImageResourceAndAddResource(RefPtr<ArchiveResource>&&);
</span><ins>+ Ref<DocumentFragment> createFragmentForImageAndURL(const String&);
</ins><span class="cx"> RefPtr<DocumentFragment> createFragmentAndAddResources(NSAttributedString *);
</span><span class="cx"> FragmentAndResources createFragment(NSAttributedString *);
</span><span class="cx"> void fillInUserVisibleForm(PasteboardURL&);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (208450 => 208451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2016-11-09 19:10:42 UTC (rev 208450)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2016-11-09 19:14:17 UTC (rev 208451)
</span><span class="lines">@@ -26,10 +26,12 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "Editor.h"
</span><span class="cx">
</span><ins>+#import "Blob.h"
</ins><span class="cx"> #import "CSSPrimitiveValueMappings.h"
</span><span class="cx"> #import "CSSValuePool.h"
</span><span class="cx"> #import "CachedResourceLoader.h"
</span><span class="cx"> #import "ColorMac.h"
</span><ins>+#import "DOMURL.h"
</ins><span class="cx"> #import "DataTransfer.h"
</span><span class="cx"> #import "DocumentFragment.h"
</span><span class="cx"> #import "DocumentLoader.h"
</span><span class="lines">@@ -610,9 +612,14 @@
</span><span class="cx"> ASSERT(type.contains('/'));
</span><span class="cx"> String typeAsFilenameWithExtension = type;
</span><span class="cx"> typeAsFilenameWithExtension.replace('/', '.');
</span><del>- URL imageURL = URL::fakeURLWithRelativePart(typeAsFilenameWithExtension);
</del><span class="cx">
</span><del>- fragment = frame.editor().createFragmentForImageResourceAndAddResource(ArchiveResource::create(WTFMove(buffer), imageURL, type, emptyString(), emptyString()));
</del><ins>+ Vector<uint8_t> data;
+ data.append(buffer->data(), buffer->size());
+ auto blob = Blob::create(WTFMove(data), type);
+ ASSERT(frame.document());
+ String blobURL = DOMURL::createObjectURL(*frame.document(), blob);
+
+ fragment = frame.editor().createFragmentForImageAndURL(blobURL);
</ins><span class="cx"> return fragment;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -671,6 +678,17 @@
</span><span class="cx"> return WTFMove(fragment);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Ref<DocumentFragment> Editor::createFragmentForImageAndURL(const String& url)
+{
+ auto imageElement = HTMLImageElement::create(*m_frame.document());
+ imageElement->setAttributeWithoutSynchronization(HTMLNames::srcAttr, url);
+
+ auto fragment = document().createDocumentFragment();
+ fragment->appendChild(imageElement);
+
+ return fragment;
+}
+
</ins><span class="cx"> RefPtr<DocumentFragment> Editor::createFragmentAndAddResources(NSAttributedString *string)
</span><span class="cx"> {
</span><span class="cx"> if (!m_frame.page() || !document().isHTMLDocument())
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/Blob.cpp (208450 => 208451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/Blob.cpp 2016-11-09 19:10:42 UTC (rev 208450)
+++ trunk/Source/WebCore/fileapi/Blob.cpp 2016-11-09 19:14:17 UTC (rev 208451)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> ThreadableBlobRegistry::registerBlobURL(m_internalURL, Vector<BlobPart>(), String());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Blob::Blob(Vector<uint8_t> data, const String& contentType)
</del><ins>+Blob::Blob(Vector<uint8_t>&& data, const String& contentType)
</ins><span class="cx"> : m_type(contentType)
</span><span class="cx"> , m_size(data.size())
</span><span class="cx"> {
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> ThreadableBlobRegistry::registerBlobURL(m_internalURL, WTFMove(blobParts), contentType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Blob::Blob(Vector<BlobPart> blobParts, const String& contentType)
</del><ins>+Blob::Blob(Vector<BlobPart>&& blobParts, const String& contentType)
</ins><span class="cx"> : m_type(contentType)
</span><span class="cx"> , m_size(-1)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/Blob.h (208450 => 208451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/Blob.h 2016-11-09 19:10:42 UTC (rev 208450)
+++ trunk/Source/WebCore/fileapi/Blob.h 2016-11-09 19:14:17 UTC (rev 208451)
</span><span class="lines">@@ -48,12 +48,12 @@
</span><span class="cx"> return adoptRef(*new Blob);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Ref<Blob> create(Vector<uint8_t> data, const String& contentType)
</del><ins>+ static Ref<Blob> create(Vector<uint8_t>&& data, const String& contentType)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new Blob(WTFMove(data), contentType));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Ref<Blob> create(Vector<BlobPart> blobParts, const String& contentType)
</del><ins>+ static Ref<Blob> create(Vector<BlobPart>&& blobParts, const String& contentType)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new Blob(WTFMove(blobParts), contentType));
</span><span class="cx"> }
</span><span class="lines">@@ -91,8 +91,8 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> Blob();
</span><del>- Blob(Vector<uint8_t>, const String& contentType);
- Blob(Vector<BlobPart>, const String& contentType);
</del><ins>+ Blob(Vector<uint8_t>&&, const String& contentType);
+ Blob(Vector<BlobPart>&&, const String& contentType);
</ins><span class="cx">
</span><span class="cx"> enum UninitializedContructor { uninitializedContructor };
</span><span class="cx"> Blob(UninitializedContructor);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobParth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobPart.h (208450 => 208451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobPart.h 2016-11-09 19:10:42 UTC (rev 208450)
+++ trunk/Source/WebCore/platform/network/BlobPart.h 2016-11-09 19:14:17 UTC (rev 208451)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- BlobPart(Vector<uint8_t> data)
</del><ins>+ BlobPart(Vector<uint8_t>&& data)
</ins><span class="cx"> : m_type(Data)
</span><span class="cx"> , m_data(WTFMove(data))
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>