<!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>[178480] branches/safari-600.4-branch/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/178480">178480</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-14 19:03:41 -0800 (Wed, 14 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/178378">r178378</a>. rdar://problems/19274499</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6004branchSourceWebCoreChangeLog">branches/safari-600.4-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6004branchSourceWebCoreWebCoreexpin">branches/safari-600.4-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6004branchSourceWebKitmacChangeLog">branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6004branchSourceWebKitmacWebViewWebImmediateActionControllermm">branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6004branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebCore/ChangeLog (178479 => 178480)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebCore/ChangeLog 2015-01-15 03:03:39 UTC (rev 178479)
+++ branches/safari-600.4-branch/Source/WebCore/ChangeLog 2015-01-15 03:03:41 UTC (rev 178480)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-01-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r178378. rdar://problem/19274499
+
+ 2015-01-13 Beth Dakin <bdakin@apple.com>
+
+ Should disable immediate actions for iTunes
+ https://bugs.webkit.org/show_bug.cgi?id=140405
+ -and corresponding-
+ rdar://problem/19461358
+
+ Reviewed by Tim Horton.
+
+ * WebCore.exp.in:
+
+2015-01-14 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r178304. rdar://problem/19447156
</span><span class="cx">
</span><span class="cx"> 2015-01-12 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebCore/WebCore.exp.in (178479 => 178480)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebCore/WebCore.exp.in 2015-01-15 03:03:39 UTC (rev 178479)
+++ branches/safari-600.4-branch/Source/WebCore/WebCore.exp.in 2015-01-15 03:03:41 UTC (rev 178480)
</span><span class="lines">@@ -861,6 +861,7 @@
</span><span class="cx"> __ZN7WebCore19TextResourceDecoder6decodeEPKcm
</span><span class="cx"> __ZN7WebCore19TextResourceDecoderC1ERKN3WTF6StringERKNS_12TextEncodingEb
</span><span class="cx"> __ZN7WebCore19TextResourceDecoderD1Ev
</span><ins>+__ZN7WebCore19applicationIsITunesEv
</ins><span class="cx"> __ZN7WebCore19enclosingLayoutRectERKNS_9FloatRectE
</span><span class="cx"> __ZN7WebCore19floatValueForLengthERKNS_6LengthEf
</span><span class="cx"> __ZN7WebCore19getFileCreationTimeERKN3WTF6StringERl
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog (178479 => 178480)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog 2015-01-15 03:03:39 UTC (rev 178479)
+++ branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog 2015-01-15 03:03:41 UTC (rev 178480)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-01-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r178378. rdar://problem/19274499
+
+ 2015-01-13 Beth Dakin <bdakin@apple.com>
+
+ Should disable immediate actions for iTunes
+ https://bugs.webkit.org/show_bug.cgi?id=140405
+ -and corresponding-
+ rdar://problem/19461358
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController _updateImmediateActionItem]):
+
+2015-01-14 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r178290. rdar://problem/19441243
</span><span class="cx">
</span><span class="cx"> 2015-01-12 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm (178479 => 178480)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-15 03:03:39 UTC (rev 178479)
+++ branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-15 03:03:41 UTC (rev 178480)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/RenderElement.h>
</span><span class="cx"> #import <WebCore/RenderObject.h>
</span><ins>+#import <WebCore/RuntimeApplicationChecks.h>
</ins><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <WebCore/TextIndicator.h>
</span><span class="cx"> #import <objc/objc-class.h>
</span><span class="lines">@@ -223,7 +224,8 @@
</span><span class="cx"> customClientAnimationController = [[_webView UIDelegate] _webView:_webView immediateActionAnimationControllerForHitTestResult:webHitTestResult.get() withType:_type];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (customClientAnimationController == [NSNull null]) {
</del><ins>+ // FIXME: We should not permanently disable this for iTunes. rdar://problem/19461358
+ if (customClientAnimationController == [NSNull null] || applicationIsITunes()) {
</ins><span class="cx"> [self _cancelImmediateAction];
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>