Title: [210645] branches/safari-603-branch/Source/WebCore
- Revision
- 210645
- Author
- [email protected]
- Date
- 2017-01-12 08:45:20 -0800 (Thu, 12 Jan 2017)
Log Message
Merge r210425. rdar://problem/29872021
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210644 => 210645)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-12 16:45:17 UTC (rev 210644)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-12 16:45:20 UTC (rev 210645)
@@ -1,5 +1,28 @@
2017-01-12 Matthew Hanson <[email protected]>
+ Merge r210425. rdar://problem/29872021
+
+ 2017-01-05 Chris Dumez <[email protected]>
+
+ [Form Validation] lengthy validation messages should be truncated with an ellipsis
+ https://bugs.webkit.org/show_bug.cgi?id=166747
+ <rdar://problem/29872021>
+
+ Reviewed by Simon Fraser.
+
+ Lengthy HTML validation messages should be truncated with an ellipsis.
+ Previously, they were truncated but there was no ellipsis.
+
+ No new tests, not easily testable. Manually tested on
+ - http://codepen.io/cdumez/full/zoOZmZ/ (last field)
+
+ * platform/ios/ValidationBubbleIOS.mm:
+ (WebCore::ValidationBubble::ValidationBubble):
+ * platform/mac/ValidationBubbleMac.mm:
+ (WebCore::ValidationBubble::ValidationBubble):
+
+2017-01-12 Matthew Hanson <[email protected]>
+
Merge r210378. rdar://problem/29024384
2017-01-05 Zalan Bujtas <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/platform/ios/ValidationBubbleIOS.mm (210644 => 210645)
--- branches/safari-603-branch/Source/WebCore/platform/ios/ValidationBubbleIOS.mm 2017-01-12 16:45:17 UTC (rev 210644)
+++ branches/safari-603-branch/Source/WebCore/platform/ios/ValidationBubbleIOS.mm 2017-01-12 16:45:20 UTC (rev 210645)
@@ -111,7 +111,7 @@
RetainPtr<UILabel> label = adoptNS([[getUILabelClass() alloc] initWithFrame:CGRectZero]);
[label setText:message];
[label setFont:[getUIFontClass() systemFontOfSize:14.0]];
- [label setLineBreakMode:NSLineBreakByWordWrapping];
+ [label setLineBreakMode:NSLineBreakByTruncatingTail];
[label setNumberOfLines:4];
[popoverView addSubview:label.get()];
Modified: branches/safari-603-branch/Source/WebCore/platform/mac/ValidationBubbleMac.mm (210644 => 210645)
--- branches/safari-603-branch/Source/WebCore/platform/mac/ValidationBubbleMac.mm 2017-01-12 16:45:17 UTC (rev 210644)
+++ branches/safari-603-branch/Source/WebCore/platform/mac/ValidationBubbleMac.mm 2017-01-12 16:45:20 UTC (rev 210645)
@@ -67,6 +67,7 @@
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
[label setMaximumNumberOfLines:4];
#endif
+ [[label cell] setTruncatesLastVisibleLine:YES];
[popoverView addSubview:label.get()];
NSSize labelSize = [label sizeThatFits:NSMakeSize(maxLabelWidth, CGFLOAT_MAX)];
[label setFrame:NSMakeRect(horizontalPadding, verticalPadding, labelSize.width, labelSize.height)];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
