TextAutosizingBoost.ChangeAutosizingBoostAtRuntime fails on iPad Simulator

wenson_hsieh@apple.com · wenson_hsieh@apple.com · commit b1b8bb6710c8 · 2019-08-02T22:57:58.000Z
https://bugs.webkit.org/show_bug.cgi?id=200402 <rdar://problem/53823368> Reviewed by Tim Horton. Make it possible to run this test using the iPad simulator. * TestWebKitAPI/Tests/ios/TextAutosizingBoost.mm: Two adjustments: (1) override the screen size to be 320 by 568 (so that the legacy text autosizing heuristic doesn't avoid boosting this text), and (2) force text autosizing on, but disable idempotent text autosizing, since this would result in differently sized text. (mainScreenReferenceBoundsOverride): * TestWebKitAPI/ios/UIKitSPI.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@248186 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,22 @@
+2019-08-02  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        TextAutosizingBoost.ChangeAutosizingBoostAtRuntime fails on iPad Simulator
+        https://bugs.webkit.org/show_bug.cgi?id=200402
+        <rdar://problem/53823368>
+
+        Reviewed by Tim Horton.
+
+        Make it possible to run this test using the iPad simulator.
+
+        * TestWebKitAPI/Tests/ios/TextAutosizingBoost.mm:
+
+        Two adjustments: (1) override the screen size to be 320 by 568 (so that the legacy text autosizing heuristic
+        doesn't avoid boosting this text), and (2) force text autosizing on, but disable idempotent text autosizing,
+        since this would result in differently sized text.
+
+        (mainScreenReferenceBoundsOverride):
+        * TestWebKitAPI/ios/UIKitSPI.h:
+
 2019-08-02  Sihui Liu  <sihui_liu@apple.com>
 
         API tests using permanent credentials should clear credentials left by previous tests
diff --git a/Tools/TestWebKitAPI/Tests/ios/TextAutosizingBoost.mm b/Tools/TestWebKitAPI/Tests/ios/TextAutosizingBoost.mm
@@ -25,16 +25,28 @@
 
 #include "config.h"
 
+#import "InstanceMethodSwizzler.h"
 #import "TestWKWebView.h"
+#import "UIKitSPI.h"
 #import <WebKit/WKPreferencesPrivate.h>
+#import <WebKit/WKPreferencesRef.h>
 
 #if PLATFORM(IOS_FAMILY)
 
+static CGRect mainScreenReferenceBoundsOverride(id, SEL)
+{
+    return CGRectMake(0, 0, 320, 568);
+}
+
 TEST(TextAutosizingBoost, ChangeAutosizingBoostAtRuntime)
 {
     static NSString *testMarkup = @"<meta name='viewport' content='width=device-width'><body style='margin: 0'><span id='top'>Hello world</span><br><span id='bottom'>Goodbye world</span></body>";
 
+    InstanceMethodSwizzler screenSizeSwizzler(UIScreen.class, @selector(_referenceBounds), reinterpret_cast<IMP>(mainScreenReferenceBoundsOverride));
+
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 960, 360)]);
+    WKPreferencesSetTextAutosizingEnabled((__bridge WKPreferencesRef)[webView configuration].preferences, true);
+    WKPreferencesSetTextAutosizingUsesIdempotentMode((__bridge WKPreferencesRef)[webView configuration].preferences, false);
     [webView synchronouslyLoadHTMLString:testMarkup];
     CGSize regularSize {
         roundf([[webView objectByEvaluatingJavaScript:@"document.getElementById('top').getBoundingClientRect().width"] floatValue]),
diff --git a/Tools/TestWebKitAPI/ios/UIKitSPI.h b/Tools/TestWebKitAPI/ios/UIKitSPI.h
@@ -35,6 +35,7 @@
 #import <UIKit/UIKeyboardImpl.h>
 #import <UIKit/UIKeyboard_Private.h>
 #import <UIKit/UIResponder_Private.h>
+#import <UIKit/UIScreen_Private.h>
 #import <UIKit/UITextInputMultiDocument.h>
 #import <UIKit/UITextInputTraits_Private.h>
 #import <UIKit/UITextInput_Private.h>
@@ -175,6 +176,10 @@ IGNORE_WARNINGS_BEGIN("deprecated-implementations")
 
 IGNORE_WARNINGS_END
 
+@interface UIScreen ()
+@property (nonatomic, readonly) CGRect _referenceBounds;
+@end
+
 #endif
 
 #if __has_include(<UIKit/UITextAutofillSuggestion.h>)
