Changeset 166458 in webkit

Timestamp:

Mar 29, 2014 10:57:40 PM (10 years ago)

Author:

ap@apple.com

Message:

Update WebKit1.StringTruncator for Mountain Lion.

• TestWebKitAPI/Tests/mac/StringTruncator.mm: Looks like one subtest was failing

due to different font metrics on 10.8.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/mac/StringTruncator.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-03-29  Alexey Proskuryakov  <ap@apple.com>
+
+        Update WebKit1.StringTruncator for Mountain Lion.
+
+        * TestWebKitAPI/Tests/mac/StringTruncator.mm: Looks like one subtest was failing
+        due to different font metrics on 10.8.
+
 2014-03-28  Darin Adler  <darin@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm

@@ -34 +34 @@
 {
     @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");
+#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 rightTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdefghijklmno…");