<!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>[170986] 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/170986">170986</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-07-10 17:12:02 -0700 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Pasting rich content does not perform a two-step paste
https://bugs.webkit.org/show_bug.cgi?id=134795
Reviewed by Benjamin Poulain.
Source/WebCore:
UIKit requires writing something (anything!) to a particular pasteboard
during copy in order to flag the content as rich. When a paste occurs,
UIKit will read this flag and perform a two-step paste.
Test: platform/ios-sim/editing/pasteboard/two-step-paste.html
* platform/ios/PlatformPasteboardIOS.mm:
(WebCore::PlatformPasteboard::write):
LayoutTests:
Copy and paste some text, and make sure that the two step paste occurred.
The mechanism for detecting this is whether or not styles have changed appropriately.
* platform/ios-sim/editing/pasteboard/two-step-paste-expected.txt: Added.
* platform/ios-sim/editing/pasteboard/two-step-paste.html: Added.
Tools:
Two-step paste requires setting InputViewObeysDOMFocus on the UIWebBrowserView.
* DumpRenderTree/mac/DumpRenderTree.mm:
(createWebViewAndOffscreenWindow):</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="#trunkSourceWebCoreplatformiosPlatformPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/platform/ios-sim/editing/pasteboard/</li>
<li><a href="#trunkLayoutTestsplatformiossimeditingpasteboardtwosteppasteexpectedtxt">trunk/LayoutTests/platform/ios-sim/editing/pasteboard/two-step-paste-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimeditingpasteboardtwosteppastehtml">trunk/LayoutTests/platform/ios-sim/editing/pasteboard/two-step-paste.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (170985 => 170986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-11 00:04:55 UTC (rev 170985)
+++ trunk/LayoutTests/ChangeLog 2014-07-11 00:12:02 UTC (rev 170986)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-07-10 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iOS] Pasting rich content does not perform a two-step paste
+ https://bugs.webkit.org/show_bug.cgi?id=134795
+
+ Reviewed by Benjamin Poulain.
+
+ Copy and paste some text, and make sure that the two step paste occurred.
+ The mechanism for detecting this is whether or not styles have changed appropriately.
+
+ * platform/ios-sim/editing/pasteboard/two-step-paste-expected.txt: Added.
+ * platform/ios-sim/editing/pasteboard/two-step-paste.html: Added.
+
</ins><span class="cx"> 2014-07-10 Jinwoo Song <jinwoo7.song@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Unreviewed EFL gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimeditingpasteboardtwosteppasteexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-sim/editing/pasteboard/two-step-paste-expected.txt (0 => 170986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-sim/editing/pasteboard/two-step-paste-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-sim/editing/pasteboard/two-step-paste-expected.txt 2014-07-11 00:12:02 UTC (rev 170986)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+The following test does a copy and a paste of contenteditable content. It then makes sure that the paste involved a two-step paste. The mechanism it uses to verify this is to determine if some styles change appropriately.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS t.style.color is not "rgb(153, 153, 153)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+This is some text
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimeditingpasteboardtwosteppastehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-sim/editing/pasteboard/two-step-paste.html (0 => 170986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-sim/editing/pasteboard/two-step-paste.html (rev 0)
+++ trunk/LayoutTests/platform/ios-sim/editing/pasteboard/two-step-paste.html 2014-07-11 00:12:02 UTC (rev 170986)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<html>
+<head>
+<script src="../../../../resources/js-test-pre.js"></script>
+<script src="../../../../editing/editing.js"></script>
+</head>
+<body>
+ <div id="container" contenteditable="true">
+ <p id="paragraph" style="color: rgb(153, 153, 153);">This is some text</p>
+ </div>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ description("The following test does a copy and a paste of contenteditable content. It then makes sure that the paste involved a two-step paste. The mechanism it uses to verify this is to determine if some styles change appropriately.");
+
+ var container = document.getElementById("container");
+ var selection = window.getSelection();
+ var range = document.createRange();
+ container.focus();
+ range.selectNodeContents(container);
+ selection.removeAllRanges();
+ selection.addRange(range);
+
+ copyCommand();
+ pasteCommand();
+
+ var t = document.getElementById("paragraph");
+ shouldNotBe("t.style.color", "\"rgb(153, 153, 153)\"");
+ </script>
+<script src="../../../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170985 => 170986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-11 00:04:55 UTC (rev 170985)
+++ trunk/Source/WebCore/ChangeLog 2014-07-11 00:12:02 UTC (rev 170986)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-07-10 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iOS] Pasting rich content does not perform a two-step paste
+ https://bugs.webkit.org/show_bug.cgi?id=134795
+
+ Reviewed by Benjamin Poulain.
+
+ UIKit requires writing something (anything!) to a particular pasteboard
+ during copy in order to flag the content as rich. When a paste occurs,
+ UIKit will read this flag and perform a two-step paste.
+
+ Test: platform/ios-sim/editing/pasteboard/two-step-paste.html
+
+ * platform/ios/PlatformPasteboardIOS.mm:
+ (WebCore::PlatformPasteboard::write):
+
</ins><span class="cx"> 2014-07-09 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Some QuickLook documents are not displayed as previews
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (170985 => 170986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2014-07-11 00:04:55 UTC (rev 170985)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2014-07-11 00:12:02 UTC (rev 170986)
</span><span class="lines">@@ -154,8 +154,12 @@
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<NSDictionary> representations = adoptNS([[NSMutableDictionary alloc] init]);
</span><span class="cx">
</span><del>- if (content.dataInWebArchiveFormat)
</del><ins>+ if (content.dataInWebArchiveFormat) {
</ins><span class="cx"> [representations setValue:(NSData *)content.dataInWebArchiveFormat->createNSData().get() forKey:WebArchivePboardType];
</span><ins>+ // Flag for UIKit to know that this copy contains rich content. This will trigger a two-step paste.
+ NSString* webIOSPastePboardType = @"iOS rich content paste pasteboard type";
+ [representations setValue:webIOSPastePboardType forKey:webIOSPastePboardType];
+ }
</ins><span class="cx">
</span><span class="cx"> if (content.dataInRTFDFormat)
</span><span class="cx"> [representations setValue:content.dataInRTFDFormat->createNSData().get() forKey:(NSString *)kUTTypeRTFD];
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170985 => 170986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-11 00:04:55 UTC (rev 170985)
+++ trunk/Tools/ChangeLog 2014-07-11 00:12:02 UTC (rev 170986)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-07-10 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iOS] Pasting rich content does not perform a two-step paste
+ https://bugs.webkit.org/show_bug.cgi?id=134795
+
+ Reviewed by Benjamin Poulain.
+
+ Two-step paste requires setting InputViewObeysDOMFocus on the UIWebBrowserView.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (createWebViewAndOffscreenWindow):
+
</ins><span class="cx"> 2014-07-10 Carlos Garcia Campos <cgarcia@igalia.com> and Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][CMake] Add a 'distcheck' target
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (170985 => 170986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-07-11 00:04:55 UTC (rev 170985)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-07-11 00:12:02 UTC (rev 170986)
</span><span class="lines">@@ -673,7 +673,7 @@
</span><span class="cx"> WebView *webView = [[WebView alloc] initWithFrame:rect frameName:nil groupName:@"org.webkit.DumpRenderTree"];
</span><span class="cx"> #else
</span><span class="cx"> UIWebBrowserView *webBrowserView = [[[DumpRenderTreeBrowserView alloc] initWithFrame:layoutTestViewportRect] autorelease];
</span><del>-
</del><ins>+ [webBrowserView setInputViewObeysDOMFocus:YES];
</ins><span class="cx"> WebView *webView = [[webBrowserView webView] retain];
</span><span class="cx"> [webView setGroupName:@"org.webkit.DumpRenderTree"];
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>