<!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>[173489] branches/safari-600.1.4.11-branch/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/173489">173489</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-09-10 14:45:22 -0700 (Wed, 10 Sep 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/173450">r173450</a>. &lt;rdar://problem/17629840&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001411branchSourceWebKit2ChangeLog">branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001411branchSourceWebKit2SharedInteractionInformationAtPositioncpp">branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp</a></li>
<li><a href="#branchessafari6001411branchSourceWebKit2SharedInteractionInformationAtPositionh">branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.h</a></li>
<li><a href="#branchessafari6001411branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#branchessafari6001411branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm">branches/safari-600.1.4.11-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001411branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog (173488 => 173489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog        2014-09-10 21:42:07 UTC (rev 173488)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog        2014-09-10 21:45:22 UTC (rev 173489)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-09-10  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
+        Merge r173450.
+
+    2014-09-09  Enrica Casucci  &lt;enrica@apple.com&gt;
+
+            REGRESSION (WebKit2): -webkit-touch-callout: none has no effect.
+            https://bugs.webkit.org/show_bug.cgi?id=136685
+            rdar://problem/17629840
+
+            Reviewed by Benjamin Poulain.
+
+            We need to check if the touch callout is enabled for the element before starting
+            the long press gesture.
+            The information about the touch callout is returned together with the rest of data
+            returned by the InteractionInformationAtPosition.
+
+            * Shared/InteractionInformationAtPosition.cpp:
+            (WebKit::InteractionInformationAtPosition::encode):
+            (WebKit::InteractionInformationAtPosition::decode):
+            * Shared/InteractionInformationAtPosition.h:
+            (WebKit::InteractionInformationAtPosition::InteractionInformationAtPosition):
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView _actionForLongPress]):
+            * WebProcess/WebPage/ios/WebPageIOS.mm:
+            (WebKit::WebPage::getPositionInformation):
+
</ins><span class="cx"> 2014-08-27  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r171782.
</span></span></pre></div>
<a id="branchessafari6001411branchSourceWebKit2SharedInteractionInformationAtPositioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp (173488 => 173489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp        2014-09-10 21:42:07 UTC (rev 173488)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp        2014-09-10 21:45:22 UTC (rev 173489)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx">     encoder &lt;&lt; nodeAtPositionIsAssistedNode;
</span><span class="cx">     encoder &lt;&lt; isSelectable;
</span><span class="cx">     encoder &lt;&lt; isNearMarkedText;
</span><ins>+    encoder &lt;&lt; touchCalloutEnabled;
</ins><span class="cx">     encoder &lt;&lt; clickableElementName;
</span><span class="cx">     encoder &lt;&lt; url;
</span><span class="cx">     encoder &lt;&lt; title;
</span><span class="lines">@@ -63,6 +64,9 @@
</span><span class="cx">     if (!decoder.decode(result.isNearMarkedText))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><ins>+    if (!decoder.decode(result.touchCalloutEnabled))
+        return false;
+    
</ins><span class="cx">     if (!decoder.decode(result.clickableElementName))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6001411branchSourceWebKit2SharedInteractionInformationAtPositionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.h (173488 => 173489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.h        2014-09-10 21:42:07 UTC (rev 173488)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/Shared/InteractionInformationAtPosition.h        2014-09-10 21:45:22 UTC (rev 173489)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">         : nodeAtPositionIsAssistedNode(false)
</span><span class="cx">         , isSelectable(false)
</span><span class="cx">         , isNearMarkedText(false)
</span><ins>+        , touchCalloutEnabled(true)
</ins><span class="cx">     {
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -47,6 +48,7 @@
</span><span class="cx">     bool nodeAtPositionIsAssistedNode;
</span><span class="cx">     bool isSelectable;
</span><span class="cx">     bool isNearMarkedText;
</span><ins>+    bool touchCalloutEnabled;
</ins><span class="cx">     String clickableElementName;
</span><span class="cx">     String url;
</span><span class="cx">     String title;
</span></span></pre></div>
<a id="branchessafari6001411branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (173488 => 173489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm        2014-09-10 21:42:07 UTC (rev 173488)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm        2014-09-10 21:45:22 UTC (rev 173489)
</span><span class="lines">@@ -782,6 +782,9 @@
</span><span class="cx"> 
</span><span class="cx"> - (SEL)_actionForLongPress
</span><span class="cx"> {
</span><ins>+    if (!_positionInformation.touchCalloutEnabled)
+        return nil;
+
</ins><span class="cx">     if (_positionInformation.clickableElementName == &quot;IMG&quot;)
</span><span class="cx">         return @selector(_showImageSheet);
</span><span class="cx">     else if (_positionInformation.clickableElementName == &quot;A&quot;) {
</span></span></pre></div>
<a id="branchessafari6001411branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (173488 => 173489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.11-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm        2014-09-10 21:42:07 UTC (rev 173488)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm        2014-09-10 21:45:22 UTC (rev 173489)
</span><span class="lines">@@ -1898,8 +1898,10 @@
</span><span class="cx">             info.title = element-&gt;fastGetAttribute(HTMLNames::titleAttr).string();
</span><span class="cx">             if (linkElement &amp;&amp; info.title.isEmpty())
</span><span class="cx">                 info.title = element-&gt;innerText();
</span><del>-            if (element-&gt;renderer())
</del><ins>+            if (element-&gt;renderer()) {
</ins><span class="cx">                 info.bounds = element-&gt;renderer()-&gt;absoluteBoundingBoxRect(true);
</span><ins>+                info.touchCalloutEnabled = element-&gt;renderer()-&gt;style().touchCalloutEnabled();
+            }
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>