<!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>[188162] 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/188162">188162</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2015-08-07 14:12:47 -0700 (Fri, 07 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Temporarily allow programmatic input assistance for adding Gmail account
https://bugs.webkit.org/show_bug.cgi?id=147792
Reviewed by Enrica Casucci.
<rdar://problem/22126518>
Temporary fix for keyboard input sliding out and immediately back in upon user interaction
in the Gmail 2-factor authentication page.
Source/WebCore:
* platform/RuntimeApplicationChecksIOS.h:
* platform/RuntimeApplicationChecksIOS.mm:
(WebCore::applicationIsGmailAddAccountOnIOS): Added bundle ID for Gmail settings.
Source/WebKit2:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _startAssistingNode:userIsInteracting:blurPreviousNode:userObject:]): Early
return no longer triggers due to lack of user interaction when adding a new Gmail account
through Settings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformRuntimeApplicationChecksIOSh">trunk/Source/WebCore/platform/RuntimeApplicationChecksIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformRuntimeApplicationChecksIOSmm">trunk/Source/WebCore/platform/RuntimeApplicationChecksIOS.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 (188161 => 188162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-07 21:12:16 UTC (rev 188161)
+++ trunk/Source/WebCore/ChangeLog 2015-08-07 21:12:47 UTC (rev 188162)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-08-07 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Temporarily allow programmatic input assistance for adding Gmail account
+ https://bugs.webkit.org/show_bug.cgi?id=147792
+
+ Reviewed by Enrica Casucci.
+ <rdar://problem/22126518>
+
+ Temporary fix for keyboard input sliding out and immediately back in upon user interaction
+ in the Gmail 2-factor authentication page.
+
+ * platform/RuntimeApplicationChecksIOS.h:
+ * platform/RuntimeApplicationChecksIOS.mm:
+ (WebCore::applicationIsGmailAddAccountOnIOS): Added bundle ID for Gmail settings.
+
</ins><span class="cx"> 2015-08-07 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when following a Google search link to Twitter with Limit Adult Content enabled
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformRuntimeApplicationChecksIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecksIOS.h (188161 => 188162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/RuntimeApplicationChecksIOS.h 2015-08-07 21:12:16 UTC (rev 188161)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecksIOS.h 2015-08-07 21:12:47 UTC (rev 188162)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> WEBCORE_EXPORT bool applicationIsTheEconomistOnIPhone();
</span><span class="cx"> bool applicationIsWebProcess();
</span><span class="cx"> bool applicationIsIBooksOnIOS();
</span><ins>+WEBCORE_EXPORT bool applicationIsGmailAddAccountOnIOS();
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformRuntimeApplicationChecksIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecksIOS.mm (188161 => 188162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/RuntimeApplicationChecksIOS.mm 2015-08-07 21:12:16 UTC (rev 188161)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecksIOS.mm 2015-08-07 21:12:47 UTC (rev 188162)
</span><span class="lines">@@ -122,6 +122,12 @@
</span><span class="cx"> return isIBooksOnIOS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool applicationIsGmailAddAccountOnIOS()
+{
+ static const bool isGmailAddAccountOnIOS = [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.social.SLGoogleAuth.SLGoogleAuthService"];
+ return isGmailAddAccountOnIOS;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (188161 => 188162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-07 21:12:16 UTC (rev 188161)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-07 21:12:47 UTC (rev 188162)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-07 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Temporarily allow programmatic input assistance for adding Gmail account
+ https://bugs.webkit.org/show_bug.cgi?id=147792
+
+ Reviewed by Enrica Casucci.
+ <rdar://problem/22126518>
+
+ Temporary fix for keyboard input sliding out and immediately back in upon user interaction
+ in the Gmail 2-factor authentication page.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _startAssistingNode:userIsInteracting:blurPreviousNode:userObject:]): Early
+ return no longer triggers due to lack of user interaction when adding a new Gmail account
+ through Settings.
+
</ins><span class="cx"> 2015-08-07 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Move concrete KeyedDecoder/Encoder implementations to WebCore.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188161 => 188162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 21:12:16 UTC (rev 188161)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-07 21:12:47 UTC (rev 188162)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> #import <WebCore/Pasteboard.h>
</span><span class="cx"> #import <WebCore/Path.h>
</span><span class="cx"> #import <WebCore/PathUtilities.h>
</span><ins>+#import <WebCore/RuntimeApplicationChecksIOS.h>
</ins><span class="cx"> #import <WebCore/Scrollbar.h>
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <WebCore/TextIndicator.h>
</span><span class="lines">@@ -3018,7 +3019,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)_startAssistingNode:(const AssistedNodeInformation&)information userIsInteracting:(BOOL)userIsInteracting blurPreviousNode:(BOOL)blurPreviousNode userObject:(NSObject <NSSecureCoding> *)userObject
</span><span class="cx"> {
</span><del>- if (!userIsInteracting && !_textSelectionAssistant)
</del><ins>+ // FIXME: This is a temporary workaround for <rdar://problem/22126518>. The real fix will involve refactoring
+ // the way we assist programmatically focused nodes.
+ if (!applicationIsGmailAddAccountOnIOS() && !userIsInteracting && !_textSelectionAssistant)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (blurPreviousNode)
</span></span></pre>
</div>
</div>
</body>
</html>