Title: [187376] trunk/Source/WebKit2
Revision
187376
Author
[email protected]
Date
2015-07-24 18:08:19 -0700 (Fri, 24 Jul 2015)

Log Message

Don't create UIWebFormAccessory if we don't require accessory view.
https://bugs.webkit.org/show_bug.cgi?id=147283

Don't try to intialize _formAccessoryView if requiresAccessoryView returns false since we don't
need it yet.

Patch by Yongjun Zhang <[email protected]> on 2015-07-24
Reviewed by Dan Bernstein.

* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView inputAccessoryView]):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (187375 => 187376)


--- trunk/Source/WebKit2/ChangeLog	2015-07-25 00:33:03 UTC (rev 187375)
+++ trunk/Source/WebKit2/ChangeLog	2015-07-25 01:08:19 UTC (rev 187376)
@@ -1,3 +1,16 @@
+2015-07-24  Yongjun Zhang  <[email protected]>
+
+        Don't create UIWebFormAccessory if we don't require accessory view.
+        https://bugs.webkit.org/show_bug.cgi?id=147283
+
+        Don't try to intialize _formAccessoryView if requiresAccessoryView returns false since we don't
+        need it yet.
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView inputAccessoryView]):
+
 2015-07-24  Anders Carlsson  <[email protected]>
 
         WKWebsiteDataStore remove methods don't properly delete cookies

Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (187375 => 187376)


--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2015-07-25 00:33:03 UTC (rev 187375)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2015-07-25 01:08:19 UTC (rev 187376)
@@ -1259,6 +1259,9 @@
 
 - (UIView *)inputAccessoryView
 {
+    if (![self requiresAccessoryView])
+        return nil;
+
     if (!_formAccessoryView) {
 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
         if ([UIWebFormAccessory instancesRespondToSelector:@selector(initWithInputAssistantItem:)])
@@ -1269,9 +1272,6 @@
         [_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

Reply via email to