Changeset 212375 in webkit

Timestamp:

Feb 15, 2017, 10:12:25 AM (10 years ago)

Author:

Chris Dumez

Message:

[iOS] Form Validation Bubble should be sensitive to Dynamic Type
​https://bugs.webkit.org/show_bug.cgi?id=168291
<rdar://problem/30508593>

Reviewed by Tim Horton.

Source/WebCore:

Update ValidationBubble implementation on iOS to stop obeying the
minimum font size setting, given that this setting is not exposed
on iOS. Instead, we now rely on
[UIFont preferredFontForTextStyle:UIFontTextStyleCallout], which
will give us a font whose size obeys Dynamic Type [1] setting on iOS.

[1] ​https://developer.apple.com/ios/human-interface-guidelines/visual-design/typography/

No new tests, no easily testable.

• platform/ios/ValidationBubbleIOS.mm:

(WebCore::ValidationBubble::ValidationBubble):

Tools:

Drop overridePreference() implementation in iOS's UIScriptController
as it was only used for the minimum font size setting and this setting
is not exposed on iOS.

• DumpRenderTree/ios/UIScriptControllerIOS.mm:
• TestRunnerShared/UIScriptContext/UIScriptController.cpp:

(WTR::UIScriptController::overridePreference):

• WebKitTestRunner/ios/UIScriptControllerIOS.mm:

LayoutTests:

Skip fast/forms/validation-message-minimum-font-size.html on iOS now
that the ValidationBubble implementation no longer obeys the minimum
font size setting on iOS.

• platform/ios-simulator/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-simulator/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/ios/ValidationBubbleIOS.mm (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm (modified) (1 diff)
• Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-02-15  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Form Validation Bubble should be sensitive to Dynamic Type
+        https://bugs.webkit.org/show_bug.cgi?id=168291
+        <rdar://problem/30508593>
+
+        Reviewed by Tim Horton.
+
+        Skip fast/forms/validation-message-minimum-font-size.html on iOS now
+        that the ValidationBubble implementation no longer obeys the minimum
+        font size setting on iOS.
+
+        * platform/ios-simulator/TestExpectations:
+
 2017-02-15  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/platform/ios-simulator/TestExpectations

@@ -2842 +2842 @@
 media/modern-media-controls/media-controller/media-controller-toggle-compact-mode.html [ Skip ]
 
+# Form validation popover does not obey minimum font size setting on iOS but Dynamic Type instead.
+fast/forms/validation-message-minimum-font-size.html [ Skip ]
+
 # New Encrypted Media API not enabled on iOS
 media/encrypted-media/mock-navigator-requestMediaKeySystemAccess.html [ Skip ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-15  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Form Validation Bubble should be sensitive to Dynamic Type
+        https://bugs.webkit.org/show_bug.cgi?id=168291
+        <rdar://problem/30508593>
+
+        Reviewed by Tim Horton.
+
+        Update ValidationBubble implementation on iOS to stop obeying the
+        minimum font size setting, given that this setting is not exposed
+        on iOS. Instead, we now rely on
+        [UIFont preferredFontForTextStyle:UIFontTextStyleCallout], which
+        will give us a font whose size obeys Dynamic Type [1] setting on iOS.
+
+        [1] https://developer.apple.com/ios/human-interface-guidelines/visual-design/typography/
+
+        No new tests, no easily testable.
+
+        * platform/ios/ValidationBubbleIOS.mm:
+        (WebCore::ValidationBubble::ValidationBubble):
+
 2017-02-15  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm

@@ -41 +41 @@
 SOFT_LINK_CLASS(UIKit, UIView);
 SOFT_LINK_CLASS(UIKit, UIViewController);
+SOFT_LINK_CONSTANT(UIKit, UIFontTextStyleCallout, UIFontTextStyle);
 
 @interface WebValidationBubbleTapRecognizer : NSObject
@@ -98 +99 @@
 static const CGFloat maxLabelWidth = 300;
 
-ValidationBubble::ValidationBubble(UIView* view, const String& message, const Settings& settings)
+ValidationBubble::ValidationBubble(UIView* view, const String& message, const Settings&)
     : m_view(view)
     , m_message(message)
@@ -111 +112 @@
     RetainPtr<UILabel> label = adoptNS([[getUILabelClass() alloc] initWithFrame:CGRectZero]);
     [label setText:message];
-    m_fontSize = std::max(settings.minimumFontSize, 14.0);
-    [label setFont:[getUIFontClass() systemFontOfSize:m_fontSize]];
+    [label setFont:[getUIFontClass() preferredFontForTextStyle:getUIFontTextStyleCallout()]];
+    m_fontSize = [[label font] pointSize];
     [label setLineBreakMode:NSLineBreakByTruncatingTail];
     [label setNumberOfLines:4];

trunk/Tools/ChangeLog

@@ +1 @@
+2017-02-15  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Form Validation Bubble should be sensitive to Dynamic Type
+        https://bugs.webkit.org/show_bug.cgi?id=168291
+        <rdar://problem/30508593>
+
+        Reviewed by Tim Horton.
+
+        Drop overridePreference() implementation in iOS's UIScriptController
+        as it was only used for the minimum font size setting and this setting
+        is not exposed on iOS.
+
+        * DumpRenderTree/ios/UIScriptControllerIOS.mm:
+        * TestRunnerShared/UIScriptContext/UIScriptController.cpp:
+        (WTR::UIScriptController::overridePreference):
+        * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+
 2017-02-15  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm

@@ -160 +160 @@
 }
 
-void UIScriptController::overridePreference(JSStringRef preferenceRef, JSStringRef valueRef)
-{
-}
-
 static CGPoint contentOffsetBoundedInValidRange(UIScrollView *scrollView, CGPoint contentOffset)
 {

trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp

@@ -398 +398 @@
 }
 
+#endif // !PLATFORM(COCOA)
+
+#if !PLATFORM(MAC)
+
 void UIScriptController::overridePreference(JSStringRef, JSStringRef)
 {
 }
-
-#endif // !PLATFORM(COCOA)
-
-#if !PLATFORM(MAC)
 
 void UIScriptController::insertText(JSStringRef, int, int)

trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm

@@ -652 +652 @@
 }
 
-void UIScriptController::overridePreference(JSStringRef preferenceRef, JSStringRef valueRef)
-{
-    TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
-    WKPreferences *preferences = webView.configuration.preferences;
-
-    String preference = toWTFString(toWK(preferenceRef));
-    String value = toWTFString(toWK(valueRef));
-    if (preference == "WebKitMinimumFontSize")
-        preferences.minimumFontSize = value.toDouble();
-}
-
 }