Title: [187511] tags/Safari-601.1.44.1/Source/WebKit2
- Revision
- 187511
- Author
- [email protected]
- Date
- 2015-07-28 13:59:29 -0700 (Tue, 28 Jul 2015)
Log Message
Roll out r187376. rdar://problem/22000647
Modified Paths
Diff
Modified: tags/Safari-601.1.44.1/Source/WebKit2/ChangeLog (187510 => 187511)
--- tags/Safari-601.1.44.1/Source/WebKit2/ChangeLog 2015-07-28 20:50:18 UTC (rev 187510)
+++ tags/Safari-601.1.44.1/Source/WebKit2/ChangeLog 2015-07-28 20:59:29 UTC (rev 187511)
@@ -1,3 +1,7 @@
+2015-07-28 Babak Shafiei <[email protected]>
+
+ Roll out r187376.
+
2015-07-27 Matthew Hanson <[email protected]>
Merge r187412. rdar://problem/22003112
Modified: tags/Safari-601.1.44.1/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (187510 => 187511)
--- tags/Safari-601.1.44.1/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-28 20:50:18 UTC (rev 187510)
+++ tags/Safari-601.1.44.1/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-28 20:59:29 UTC (rev 187511)
@@ -1259,9 +1259,6 @@
- (UIView *)inputAccessoryView
{
- if (![self requiresAccessoryView])
- return nil;
-
if (!_formAccessoryView) {
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
if ([UIWebFormAccessory instancesRespondToSelector:@selector(initWithInputAssistantItem:)])
@@ -1272,6 +1269,9 @@
[_formAccessoryView setDelegate:self];
}
+ if (![self requiresAccessoryView])
+ return nil;
+
return _formAccessoryView.get();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
