Title: [186629] branches/safari-600.8-branch/Tools
- Revision
- 186629
- Author
- matthew_han...@apple.com
- Date
- 2015-07-09 14:03:25 -0700 (Thu, 09 Jul 2015)
Log Message
Merge r186568. rdar://problem/21716428
Modified Paths
Diff
Modified: branches/safari-600.8-branch/Tools/ChangeLog (186628 => 186629)
--- branches/safari-600.8-branch/Tools/ChangeLog 2015-07-09 21:03:23 UTC (rev 186628)
+++ branches/safari-600.8-branch/Tools/ChangeLog 2015-07-09 21:03:25 UTC (rev 186629)
@@ -1,3 +1,17 @@
+2015-07-09 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r186568. rdar://problem/21716428
+
+ 2015-07-08 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r184975. rdar://problem/21716564
+
+ 2015-05-28 Alexey Proskuryakov <a...@apple.com>
+
+ Update results of WebKit1.StringTruncator after r184965.
+
+ * TestWebKitAPI/Tests/mac/StringTruncator.mm: (TestWebKitAPI::TEST):
+
2015-06-08 Babak Shafiei <bshaf...@apple.com>
Merge r183682.
Modified: branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm (186628 => 186629)
--- branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm 2015-07-09 21:03:23 UTC (rev 186628)
+++ branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm 2015-07-09 21:03:25 UTC (rev 186629)
@@ -34,11 +34,11 @@
{
@autoreleasepool {
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdef…tuvwxyz");
+ EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdefg…tuvwxyz");
#else
EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdefg…tuvwxyz");
#endif
- EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100] UTF8String], "abcde…uvwxyz");
+ EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100] UTF8String], "abcdef…uvwxyz");
EXPECT_STREQ([[WebStringTruncator rightTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdefghijklmno…");
EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"ābcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "ābcdefg…tuvwxyz");
EXPECT_STREQ([[WebStringTruncator rightTruncateString:@"ābcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "ābcdefghijklmno…");
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
