Title: [188197] branches/safari-601.1.46-branch/Source
- Revision
- 188197
- Author
- [email protected]
- Date
- 2015-08-09 15:15:23 -0700 (Sun, 09 Aug 2015)
Log Message
Merged r188162. rdar://problem/22126518
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (188196 => 188197)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-09 20:39:56 UTC (rev 188196)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-09 22:15:23 UTC (rev 188197)
@@ -1,3 +1,22 @@
+2015-08-09 Babak Shafiei <[email protected]>
+
+ Merge r188162.
+
+ 2015-08-07 Wenson Hsieh <[email protected]>
+
+ 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.
+
2015-08-07 Babak Shafiei <[email protected]>
Merge r188150.
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.h (188196 => 188197)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.h 2015-08-09 20:39:56 UTC (rev 188196)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.h 2015-08-09 22:15:23 UTC (rev 188197)
@@ -43,6 +43,7 @@
WEBCORE_EXPORT bool applicationIsTheEconomistOnIPhone();
bool applicationIsWebProcess();
bool applicationIsIBooksOnIOS();
+WEBCORE_EXPORT bool applicationIsGmailAddAccountOnIOS();
} // namespace WebCore
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.mm (188196 => 188197)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.mm 2015-08-09 20:39:56 UTC (rev 188196)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.mm 2015-08-09 22:15:23 UTC (rev 188197)
@@ -122,6 +122,12 @@
return isIBooksOnIOS;
}
+bool applicationIsGmailAddAccountOnIOS()
+{
+ static const bool isGmailAddAccountOnIOS = [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.social.SLGoogleAuth.SLGoogleAuthService"];
+ return isGmailAddAccountOnIOS;
+}
+
} // namespace WebCore
#endif // PLATFORM(IOS)
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188196 => 188197)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-09 20:39:56 UTC (rev 188196)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-09 22:15:23 UTC (rev 188197)
@@ -1,3 +1,23 @@
+2015-08-09 Babak Shafiei <[email protected]>
+
+ Merge r188162.
+
+ 2015-08-07 Wenson Hsieh <[email protected]>
+
+ 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.
+
2015-08-07 Lucas Forschler <[email protected]>
Merge r188115
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188196 => 188197)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-09 20:39:56 UTC (rev 188196)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-09 22:15:23 UTC (rev 188197)
@@ -64,6 +64,7 @@
#import <WebCore/Pasteboard.h>
#import <WebCore/Path.h>
#import <WebCore/PathUtilities.h>
+#import <WebCore/RuntimeApplicationChecksIOS.h>
#import <WebCore/Scrollbar.h>
#import <WebCore/SoftLinking.h>
#import <WebCore/TextIndicator.h>
@@ -3017,7 +3018,9 @@
- (void)_startAssistingNode:(const AssistedNodeInformation&)information userIsInteracting:(BOOL)userIsInteracting blurPreviousNode:(BOOL)blurPreviousNode userObject:(NSObject <NSSecureCoding> *)userObject
{
- if (!userIsInteracting && !_textSelectionAssistant)
+ // 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)
return;
if (blurPreviousNode)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
