<!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>[191830] trunk/Source/WebKit2</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/191830">191830</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-10-30 16:59:28 -0700 (Fri, 30 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Link preview doesn't work on XHTML pages with Content-Type header as
‘application/xhtml+xml’
https://bugs.webkit.org/show_bug.cgi?id=150740
-and corresponding-
rdar://problem/23063585
Reviewed by Tim Horton.
For XHTML pages, the element names are lowercase. This patch uses
equalIgnoringCase to fix the bug.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _actionForLongPress]):
(-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
(-[WKContentView _dataForPreviewItemController:atPosition:type:]):</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191829 => 191830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-30 23:56:39 UTC (rev 191829)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-30 23:59:28 UTC (rev 191830)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-10-30 Beth Dakin <bdakin@apple.com>
+
+ Link preview doesn't work on XHTML pages with Content-Type header as
+ ‘application/xhtml+xml’
+ https://bugs.webkit.org/show_bug.cgi?id=150740
+ -and corresponding-
+ rdar://problem/23063585
+
+ Reviewed by Tim Horton.
+
+ For XHTML pages, the element names are lowercase. This patch uses
+ equalIgnoringCase to fix the bug.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _actionForLongPress]):
+ (-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
+ (-[WKContentView _dataForPreviewItemController:atPosition:type:]):
+
</ins><span class="cx"> 2015-10-30 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WKView being inside WKWebView leads to weird API issues
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (191829 => 191830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-10-30 23:56:39 UTC (rev 191829)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-10-30 23:59:28 UTC (rev 191830)
</span><span class="lines">@@ -1048,14 +1048,16 @@
</span><span class="cx"> if (!_positionInformation.touchCalloutEnabled)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- if (_positionInformation.clickableElementName == "IMG")
</del><ins>+ if (equalIgnoringCase(_positionInformation.clickableElementName, "IMG"))
</ins><span class="cx"> return @selector(_showImageSheet);
</span><del>- else if (_positionInformation.clickableElementName == "A") {
</del><ins>+
+ if (equalIgnoringCase(_positionInformation.clickableElementName, "A")) {
</ins><span class="cx"> NSURL *targetURL = [NSURL URLWithString:_positionInformation.url];
</span><span class="cx"> if ([[getDDDetectionControllerClass() tapAndHoldSchemes] containsObject:[targetURL scheme]])
</span><span class="cx"> return @selector(_showDataDetectorsSheet);
</span><span class="cx"> return @selector(_showLinkSheet);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3431,11 +3433,11 @@
</span><span class="cx"> return NO;
</span><span class="cx">
</span><span class="cx"> [self ensurePositionInformationIsUpToDate:position];
</span><del>- if (_positionInformation.clickableElementName != "A" && _positionInformation.clickableElementName != "IMG")
</del><ins>+ if (equalIgnoringCase(_positionInformation.clickableElementName, "A") && equalIgnoringCase(_positionInformation.clickableElementName, "IMG"))
</ins><span class="cx"> return NO;
</span><span class="cx">
</span><span class="cx"> String absoluteLinkURL = _positionInformation.url;
</span><del>- if (_positionInformation.clickableElementName == "A") {
</del><ins>+ if (equalIgnoringCase(_positionInformation.clickableElementName, "A")) {
</ins><span class="cx"> if (absoluteLinkURL.isEmpty())
</span><span class="cx"> return NO;
</span><span class="cx"> if (WebCore::protocolIsInHTTPFamily(absoluteLinkURL))
</span><span class="lines">@@ -3454,8 +3456,8 @@
</span><span class="cx">
</span><span class="cx"> id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
</span><span class="cx"> BOOL supportsImagePreview = [uiDelegate respondsToSelector:@selector(_webView:commitPreviewedImageWithURL:)];
</span><del>- BOOL canShowImagePreview = _positionInformation.clickableElementName == "IMG" && supportsImagePreview;
- BOOL canShowLinkPreview = _positionInformation.clickableElementName == "A" || canShowImagePreview;
</del><ins>+ BOOL canShowImagePreview = equalIgnoringCase(_positionInformation.clickableElementName, "IMG") && supportsImagePreview;
+ BOOL canShowLinkPreview = equalIgnoringCase(_positionInformation.clickableElementName, "A") || canShowImagePreview;
</ins><span class="cx"> BOOL useImageURLForLink = NO;
</span><span class="cx">
</span><span class="cx"> if (canShowImagePreview && _positionInformation.isAnimatedImage) {
</span></span></pre>
</div>
</div>
</body>
</html>