Changeset 187376 in webkit

Timestamp:

Jul 24, 2015, 6:08:19 PM (10 years ago)

Author:

commit-queue@webkit.org

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 <​yongjun_zhang@apple.com> on 2015-07-24
Reviewed by Dan Bernstein.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView inputAccessoryView]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-24  Yongjun Zhang  <yongjun_zhang@apple.com>
+
+        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  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -1260 +1260 @@
 - (UIView *)inputAccessoryView
 {
+    if (![self requiresAccessoryView])
+        return nil;
+
     if (!_formAccessoryView) {
 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
@@ -1270 +1273 @@
     }
 
-    if (![self requiresAccessoryView])
-        return nil;
-    
     return _formAccessoryView.get();
 }