<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[212375] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/212375">212375</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-02-15 10:12:25 -0800 (Wed, 15 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosValidationBubbleIOSmm">trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosUIScriptControllerIOSmm">trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm</a></li>
<li><a href="#trunkToolsTestRunnerSharedUIScriptContextUIScriptControllercpp">trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosUIScriptControllerIOSmm">trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212374 => 212375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-15 18:09:41 UTC (rev 212374)
+++ trunk/LayoutTests/ChangeLog 2017-02-15 18:12:25 UTC (rev 212375)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+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:
+
</ins><span class="cx"> 2017-02-15 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark animations/trigger-container-scroll-empty.html as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (212374 => 212375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-02-15 18:09:41 UTC (rev 212374)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-02-15 18:12:25 UTC (rev 212375)
</span><span class="lines">@@ -2841,6 +2841,9 @@
</span><span class="cx"> media/modern-media-controls/media-controller/media-controller-tight-padding.html [ Skip ]
</span><span class="cx"> media/modern-media-controls/media-controller/media-controller-toggle-compact-mode.html [ Skip ]
</span><span class="cx">
</span><ins>+# 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 ]
+
</ins><span class="cx"> # New Encrypted Media API not enabled on iOS
</span><span class="cx"> media/encrypted-media/mock-navigator-requestMediaKeySystemAccess.html [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212374 => 212375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-15 18:09:41 UTC (rev 212374)
+++ trunk/Source/WebCore/ChangeLog 2017-02-15 18:12:25 UTC (rev 212375)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+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):
+
</ins><span class="cx"> 2017-02-15 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Drop PassRefPtr
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosValidationBubbleIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm (212374 => 212375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm 2017-02-15 18:09:41 UTC (rev 212374)
+++ trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm 2017-02-15 18:12:25 UTC (rev 212375)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UITapGestureRecognizer);
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIView);
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIViewController);
</span><ins>+SOFT_LINK_CONSTANT(UIKit, UIFontTextStyleCallout, UIFontTextStyle);
</ins><span class="cx">
</span><span class="cx"> @interface WebValidationBubbleTapRecognizer : NSObject
</span><span class="cx"> @end
</span><span class="lines">@@ -97,7 +98,7 @@
</span><span class="cx"> static const CGFloat verticalPadding = 9;
</span><span class="cx"> static const CGFloat maxLabelWidth = 300;
</span><span class="cx">
</span><del>-ValidationBubble::ValidationBubble(UIView* view, const String& message, const Settings& settings)
</del><ins>+ValidationBubble::ValidationBubble(UIView* view, const String& message, const Settings&)
</ins><span class="cx"> : m_view(view)
</span><span class="cx"> , m_message(message)
</span><span class="cx"> {
</span><span class="lines">@@ -110,8 +111,8 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<UILabel> label = adoptNS([[getUILabelClass() alloc] initWithFrame:CGRectZero]);
</span><span class="cx"> [label setText:message];
</span><del>- m_fontSize = std::max(settings.minimumFontSize, 14.0);
- [label setFont:[getUIFontClass() systemFontOfSize:m_fontSize]];
</del><ins>+ [label setFont:[getUIFontClass() preferredFontForTextStyle:getUIFontTextStyleCallout()]];
+ m_fontSize = [[label font] pointSize];
</ins><span class="cx"> [label setLineBreakMode:NSLineBreakByTruncatingTail];
</span><span class="cx"> [label setNumberOfLines:4];
</span><span class="cx"> [popoverView addSubview:label.get()];
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (212374 => 212375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-15 18:09:41 UTC (rev 212374)
+++ trunk/Tools/ChangeLog 2017-02-15 18:12:25 UTC (rev 212375)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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:
+
</ins><span class="cx"> 2017-02-15 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> webkitpy: Memoize app_identifier_from_bundle for efficiency, call parent class for _get_crash_log
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosUIScriptControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm (212374 => 212375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm 2017-02-15 18:09:41 UTC (rev 212374)
+++ trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm 2017-02-15 18:12:25 UTC (rev 212375)
</span><span class="lines">@@ -159,10 +159,6 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UIScriptController::overridePreference(JSStringRef preferenceRef, JSStringRef valueRef)
-{
-}
-
</del><span class="cx"> static CGPoint contentOffsetBoundedInValidRange(UIScrollView *scrollView, CGPoint contentOffset)
</span><span class="cx"> {
</span><span class="cx"> UIEdgeInsets contentInsets = scrollView.contentInset;
</span></span></pre></div>
<a id="trunkToolsTestRunnerSharedUIScriptContextUIScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp (212374 => 212375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp 2017-02-15 18:09:41 UTC (rev 212374)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp 2017-02-15 18:12:25 UTC (rev 212375)
</span><span class="lines">@@ -397,14 +397,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif // !PLATFORM(COCOA)
+
+#if !PLATFORM(MAC)
+
</ins><span class="cx"> void UIScriptController::overridePreference(JSStringRef, JSStringRef)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !PLATFORM(COCOA)
-
-#if !PLATFORM(MAC)
-
</del><span class="cx"> void UIScriptController::insertText(JSStringRef, int, int)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosUIScriptControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm (212374 => 212375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2017-02-15 18:09:41 UTC (rev 212374)
+++ trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2017-02-15 18:12:25 UTC (rev 212375)
</span><span class="lines">@@ -651,17 +651,6 @@
</span><span class="cx"> webView.didEndScrollingCallback = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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();
</del><span class="cx"> }
</span><span class="cx">
</span><del>-}
-
</del><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>