Changeset 181569 in webkit

Timestamp:

Mar 16, 2015, 11:30:34 AM (11 years ago)

Author:

ap@apple.com

Message:

[Mac] fast/forms/text-control-intrinsic-widths.html fails when MS Office is installed
​https://bugs.webkit.org/show_bug.cgi?id=142720

Reviewed by Myles C. Maxfield.

Tools:

Activate system copies of Microsoft fonts for the current process, thus overriding
any other ones that could be preferred by the system otherwise.

• DumpRenderTree/mac/DumpRenderTree.mm:

(activateSystemCoreWebFonts):
(adjustFonts):

• WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:

(WTR::activateSystemCoreWebFonts):
(WTR::activateFonts):

LayoutTests:

• platform/mac-mavericks/fast/forms/text-control-intrinsic-widths-expected.txt: Removed.

Mavericks result is no different from Yosemite.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-mavericks/fast/forms/text-control-intrinsic-widths-expected.txt (deleted)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (2 diffs)
• Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-16  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] fast/forms/text-control-intrinsic-widths.html fails when MS Office is installed
+        https://bugs.webkit.org/show_bug.cgi?id=142720
+
+        Reviewed by Myles C. Maxfield.
+
+        * platform/mac-mavericks/fast/forms/text-control-intrinsic-widths-expected.txt: Removed.
+        Mavericks result is no different from Yosemite.
+
 2015-03-16  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2015-03-16  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] fast/forms/text-control-intrinsic-widths.html fails when MS Office is installed
+        https://bugs.webkit.org/show_bug.cgi?id=142720
+
+        Reviewed by Myles C. Maxfield.
+
+        Activate system copies of Microsoft fonts for the current process, thus overriding
+        any other ones that could be preferred by the system otherwise.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (activateSystemCoreWebFonts):
+        (adjustFonts):
+        * WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:
+        (WTR::activateSystemCoreWebFonts):
+        (WTR::activateFonts):
+
 2015-03-16  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -474 +474 @@
 }
 
+// Activating system copies of these fonts overrides any others that could be preferred, such as ones
+// in /Library/Fonts/Microsoft, and which don't always have the same metrics.
+// FIXME: Switch to a solution from <rdar://problem/19553550> once it's available.
+static void activateSystemCoreWebFonts()
+{
+    NSArray *coreWebFontNames = @[
+        @"Andale Mono",
+        @"Arial",
+        @"Arial Black",
+        @"Comic Sans MS",
+        @"Courier New",
+        @"Georgia",
+        @"Impact",
+        @"Times New Roman",
+        @"Trebuchet MS",
+        @"Verdana",
+        @"Webdings"
+    ];
+
+    NSArray *fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtURL:[NSURL fileURLWithPath:@"/Library/Fonts" isDirectory:YES]
+        includingPropertiesForKeys:@[NSURLFileResourceTypeKey, NSURLNameKey] options:0 error:0];
+
+    for (NSURL *fontURL in fontFiles) {
+        NSString *resourceType;
+        NSString *fileName;
+        if (![fontURL getResourceValue:&resourceType forKey:NSURLFileResourceTypeKey error:0]
+            || ![fontURL getResourceValue:&fileName forKey:NSURLNameKey error:0])
+            continue;
+        if (![resourceType isEqualToString:NSURLFileResourceTypeRegular])
+            continue;
+
+        // Activate all font variations, such as Arial Bold Italic.ttf. This algorithm is not 100% precise, as it
+        // also activates e.g. Arial Unicode, which is not a variation of Arial.
+        for (NSString *coreWebFontName in coreWebFontNames) {
+            if ([fileName hasPrefix:coreWebFontName]) {
+                CTFontManagerRegisterFontsForURL((CFURLRef)fontURL, kCTFontManagerScopeProcess, 0);
+                break;
+            }
+        }
+    }
+}
+
 static void activateTestingFonts()
 {
@@ -509 +551 @@
 {
     swizzleNSFontManagerMethods();
+    activateSystemCoreWebFonts();
     activateTestingFonts();
 }

trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm

@@ -242 +242 @@
 }
 
+// Activating system copies of these fonts overrides any others that could be preferred, such as ones
+// in /Library/Fonts/Microsoft, and which don't always have the same metrics.
+// FIXME: Switch to a solution from <rdar://problem/19553550> once it's available.
+static void activateSystemCoreWebFonts()
+{
+    NSArray *coreWebFontNames = @[
+        @"Andale Mono",
+        @"Arial",
+        @"Arial Black",
+        @"Comic Sans MS",
+        @"Courier New",
+        @"Georgia",
+        @"Impact",
+        @"Times New Roman",
+        @"Trebuchet MS",
+        @"Verdana",
+        @"Webdings"
+    ];
+
+    NSArray *fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtURL:[NSURL fileURLWithPath:@"/Library/Fonts" isDirectory:YES]
+        includingPropertiesForKeys:@[NSURLFileResourceTypeKey, NSURLNameKey] options:0 error:0];
+
+    for (NSURL *fontURL in fontFiles) {
+        NSString *resourceType;
+        NSString *fileName;
+        if (![fontURL getResourceValue:&resourceType forKey:NSURLFileResourceTypeKey error:0]
+            || ![fontURL getResourceValue:&fileName forKey:NSURLNameKey error:0])
+            continue;
+        if (![resourceType isEqualToString:NSURLFileResourceTypeRegular])
+            continue;
+
+        // Activate all font variations, such as Arial Bold Italic.ttf. This algorithm is not 100% precise, as it
+        // also activates e.g. Arial Unicode, which is not a variation of Arial.
+        for (NSString *coreWebFontName in coreWebFontNames) {
+            if ([fileName hasPrefix:coreWebFontName]) {
+                CTFontManagerRegisterFontsForURL((CFURLRef)fontURL, kCTFontManagerScopeProcess, 0);
+                break;
+            }
+        }
+    }
+}
+
 #endif // USE(APPKIT)
 
@@ -277 +319 @@
 #if USE(APPKIT)
     swizzleNSFontManagerMethods();
+    activateSystemCoreWebFonts();
 #endif // USE(APPKIT)
 }