<!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>[178175] trunk/Source</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/178175">178175</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2015-01-09 10:31:12 -0800 (Fri, 09 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Cannot paste an image URL in a plain text field in a page.
https://bugs.webkit.org/show_bug.cgi?id=140274
rdar://problem/18590809
Reviewed by Alexey Proskuryakov.
Source/WebCore:
When we want to get plain text from the pasteboard, we
should also try kUTTypeURL if there is no kUTTypeText available.
* WebCore.exp.in:
* platform/ios/PasteboardIOS.mm:
(WebCore::Pasteboard::read):
* platform/ios/PlatformPasteboardIOS.mm:
(WebCore::PlatformPasteboard::readString):
Source/WebKit2:
supportedPasteboardTypesForCurrentSelection should include kUTTypeURL for plain
text controls and WebArchivePboardType for rich text controls.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView supportedPasteboardTypesForCurrentSelection]): Remove obsolete and
incorrect FIXME.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PasteboardIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlatformPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178174 => 178175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-09 17:50:14 UTC (rev 178174)
+++ trunk/Source/WebCore/ChangeLog        2015-01-09 18:31:12 UTC (rev 178175)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-01-08 Enrica Casucci <enrica@apple.com>
+
+ [iOS] Cannot paste an image URL in a plain text field in a page.
+ https://bugs.webkit.org/show_bug.cgi?id=140274
+ rdar://problem/18590809
+
+ Reviewed by Alexey Proskuryakov.
+
+ When we want to get plain text from the pasteboard, we
+ should also try kUTTypeURL if there is no kUTTypeText available.
+
+ * WebCore.exp.in:
+ * platform/ios/PasteboardIOS.mm:
+ (WebCore::Pasteboard::read):
+ * platform/ios/PlatformPasteboardIOS.mm:
+ (WebCore::PlatformPasteboard::readString):
+
</ins><span class="cx"> 2015-01-09 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r178154, r178163, and r178164.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (178174 => 178175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in        2015-01-09 17:50:14 UTC (rev 178174)
+++ trunk/Source/WebCore/WebCore.exp.in        2015-01-09 18:31:12 UTC (rev 178175)
</span><span class="lines">@@ -2693,6 +2693,7 @@
</span><span class="cx"> __ZN7WebCore19applicationIsWebAppEv
</span><span class="cx"> __ZN7WebCore19asciiLineBreakTableE
</span><span class="cx"> __ZN7WebCore20PlatformEventFactory27createPlatformKeyboardEventEP8WebEvent
</span><ins>+__ZN7WebCore20WebArchivePboardTypeE
</ins><span class="cx"> __ZN7WebCore20applicationIsOkCupidEv
</span><span class="cx"> __ZN7WebCore20endOfEditableContentERKNS_15VisiblePositionE
</span><span class="cx"> __ZN7WebCore20lastOffsetForEditingEPKNS_4NodeE
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (178174 => 178175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PasteboardIOS.mm        2015-01-09 17:50:14 UTC (rev 178174)
+++ trunk/Source/WebCore/platform/ios/PasteboardIOS.mm        2015-01-09 18:31:12 UTC (rev 178175)
</span><span class="lines">@@ -169,6 +169,8 @@
</span><span class="cx"> {
</span><span class="cx"> PasteboardStrategy& strategy = *platformStrategies()->pasteboardStrategy();
</span><span class="cx"> text.text = strategy.readStringFromPasteboard(0, kUTTypeText);
</span><ins>+ if (text.text.isEmpty())
+ text.text = strategy.readStringFromPasteboard(0, kUTTypeURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NSArray* supportedImageTypes()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (178174 => 178175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm        2015-01-09 17:50:14 UTC (rev 178174)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm        2015-01-09 18:31:12 UTC (rev 178175)
</span><span class="lines">@@ -217,11 +217,18 @@
</span><span class="cx"> return String();
</span><span class="cx">
</span><span class="cx"> id value = [pasteboardItem objectAtIndex:0];
</span><del>- ASSERT([value isKindOfClass:[NSString class]]);
- if (![value isKindOfClass:[NSString class]])
- return String();
</del><ins>+
+ if (type == String(kUTTypeText)) {
+ ASSERT([value isKindOfClass:[NSString class]]);
+ if ([value isKindOfClass:[NSString class]])
+ return String(value);
+ } else if (type == String(kUTTypeURL)) {
+ ASSERT([value isKindOfClass:[NSURL class]]);
+ if ([value isKindOfClass:[NSURL class]])
+ return [(NSURL *)value absoluteString];
+ }
</ins><span class="cx">
</span><del>- return String(value);
</del><ins>+ return String();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URL PlatformPasteboard::readURL(int index, const String& type)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178174 => 178175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-01-09 17:50:14 UTC (rev 178174)
+++ trunk/Source/WebKit2/ChangeLog        2015-01-09 18:31:12 UTC (rev 178175)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-08 Enrica Casucci <enrica@apple.com>
+
+ [iOS] Cannot paste an image URL in a plain text field in a page.
+ https://bugs.webkit.org/show_bug.cgi?id=140274
+ rdar://problem/18590809
+
+ Reviewed by Alexey Proskuryakov.
+
+ supportedPasteboardTypesForCurrentSelection should include kUTTypeURL for plain
+ text controls and WebArchivePboardType for rich text controls.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView supportedPasteboardTypesForCurrentSelection]): Remove obsolete and
+ incorrect FIXME.
+
</ins><span class="cx"> 2015-01-09 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r178141.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (178174 => 178175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm        2015-01-09 17:50:14 UTC (rev 178174)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm        2015-01-09 18:31:12 UTC (rev 178175)
</span><span class="lines">@@ -52,9 +52,11 @@
</span><span class="cx"> #import "_WKFormInputSession.h"
</span><span class="cx"> #import <CoreText/CTFont.h>
</span><span class="cx"> #import <CoreText/CTFontDescriptor.h>
</span><ins>+#import <MobileCoreServices/UTCoreTypes.h>
</ins><span class="cx"> #import <WebCore/Color.h>
</span><span class="cx"> #import <WebCore/CoreGraphicsSPI.h>
</span><span class="cx"> #import <WebCore/FloatQuad.h>
</span><ins>+#import <WebCore/Pasteboard.h>
</ins><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <WebCore/WebEvent.h>
</span><span class="cx"> #import <WebKit/WebSelectionRect.h> // FIXME: WK2 should not include WebKit headers!
</span><span class="lines">@@ -1186,13 +1188,11 @@
</span><span class="cx"> static NSMutableArray *plainTextTypes = nil;
</span><span class="cx"> if (!plainTextTypes) {
</span><span class="cx"> plainTextTypes = [[NSMutableArray alloc] init];
</span><del>- // FIXME: should add [plainTextTypes addObject:(id)kUTTypeURL];
- // when we figure out how to share this type between WebCore and WebKit2
</del><ins>+ [plainTextTypes addObject:(id)kUTTypeURL];
</ins><span class="cx"> [plainTextTypes addObjectsFromArray:UIPasteboardTypeListString];
</span><span class="cx">
</span><span class="cx"> richTypes = [[NSMutableArray alloc] init];
</span><del>- // FIXME: should add [richTypes addObject:(PasteboardTypes::WebArchivePboardType)];
- // when we figure out how to share this type between WebCore and WebKit2
</del><ins>+ [richTypes addObject:WebArchivePboardType];
</ins><span class="cx"> [richTypes addObjectsFromArray:UIPasteboardTypeListImage];
</span><span class="cx"> [richTypes addObjectsFromArray:plainTextTypes];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>