Revert an unnecessary workaround when zooming focused form controls
authorwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Mar 2018 14:39:01 +0000 (14:39 +0000)
committerwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Mar 2018 14:39:01 +0000 (14:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=184067
<rdar://problem/38805254>

Reviewed by Tim Horton.

Reverts an unintended change introduced in r227984.

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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230029 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

index 3a56187..1c55743 100644 (file)
@@ -1,3 +1,16 @@
+2018-03-28  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Revert an unnecessary workaround when zooming focused form controls
+        https://bugs.webkit.org/show_bug.cgi?id=184067
+        <rdar://problem/38805254>
+
+        Reviewed by Tim Horton.
+
+        Reverts an unintended change introduced in r227984.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _displayFormNodeInputView]):
+
 2018-03-28  Miguel Gomez  <magomez@igalia.com>
 
         [GTK][WPE] Remove UpdateAtlas
index 96999a7..7a28c5a 100644 (file)
@@ -1261,7 +1261,7 @@ static NSValue *nsSizeForTapHighlightBorderRadius(WebCore::IntSize borderRadius,
         fontSize:_assistedNodeInformation.nodeFontSize
         minimumScale:_assistedNodeInformation.minimumScaleFactor
         maximumScale:_assistedNodeInformation.maximumScaleFactorIgnoringAlwaysScalable
-        allowScaling:_assistedNodeInformation.allowsUserScalingIgnoringAlwaysScalable && [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone
+        allowScaling:_assistedNodeInformation.allowsUserScalingIgnoringAlwaysScalable && !currentUserInterfaceIdiomIsPad()
         forceScroll:[self requiresAccessoryView]];
 
     _didAccessoryTabInitiateFocus = NO;