- Revision
- 181569
- Author
- [email protected]
- Date
- 2015-03-16 11:30:34 -0700 (Mon, 16 Mar 2015)
Log 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.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (181568 => 181569)
--- trunk/LayoutTests/ChangeLog 2015-03-16 18:23:54 UTC (rev 181568)
+++ trunk/LayoutTests/ChangeLog 2015-03-16 18:30:34 UTC (rev 181569)
@@ -1,3 +1,13 @@
+2015-03-16 Alexey Proskuryakov <[email protected]>
+
+ [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 <[email protected]>
[Win] Document more debug assertions.
Deleted: trunk/LayoutTests/platform/mac-mavericks/fast/forms/text-control-intrinsic-widths-expected.txt (181568 => 181569)
--- trunk/LayoutTests/platform/mac-mavericks/fast/forms/text-control-intrinsic-widths-expected.txt 2015-03-16 18:23:54 UTC (rev 181568)
+++ trunk/LayoutTests/platform/mac-mavericks/fast/forms/text-control-intrinsic-widths-expected.txt 2015-03-16 18:30:34 UTC (rev 181569)
@@ -1,387 +0,0 @@
-This test measures the width of textareas and text inputs for different fonts.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Lucida Grande
-input
-size=1 clientWidth=24
-size=2 clientWidth=29
-size=3 clientWidth=34
-size=4 clientWidth=39
-size=5 clientWidth=44
-size=10 clientWidth=69
-size=20 clientWidth=119
-size=50 clientWidth=269
-size=100 clientWidth=519
-size=500 clientWidth=2519
-size=1000 clientWidth=5019
-
-textarea
-cols=1 clientWidth=26
-cols=2 clientWidth=33
-cols=3 clientWidth=40
-cols=4 clientWidth=47
-cols=5 clientWidth=54
-cols=10 clientWidth=89
-cols=20 clientWidth=159
-cols=50 clientWidth=369
-cols=100 clientWidth=719
-cols=500 clientWidth=3519
-cols=1000 clientWidth=7019
-
-Courier
-input
-size=1 clientWidth=9
-size=2 clientWidth=15
-size=3 clientWidth=22
-size=4 clientWidth=28
-size=5 clientWidth=35
-size=10 clientWidth=68
-size=20 clientWidth=134
-size=50 clientWidth=332
-size=100 clientWidth=662
-size=500 clientWidth=3303
-size=1000 clientWidth=6603
-
-textarea
-cols=1 clientWidth=26
-cols=2 clientWidth=33
-cols=3 clientWidth=39
-cols=4 clientWidth=46
-cols=5 clientWidth=53
-cols=10 clientWidth=86
-cols=20 clientWidth=152
-cols=50 clientWidth=350
-cols=100 clientWidth=680
-cols=500 clientWidth=3320
-cols=1000 clientWidth=6621
-
-Helvetica
-input
-size=1 clientWidth=8
-size=2 clientWidth=14
-size=3 clientWidth=20
-size=4 clientWidth=26
-size=5 clientWidth=33
-size=10 clientWidth=63
-size=20 clientWidth=124
-size=50 clientWidth=308
-size=100 clientWidth=614
-size=500 clientWidth=3061
-size=1000 clientWidth=6120
-
-textarea
-cols=1 clientWidth=26
-cols=2 clientWidth=32
-cols=3 clientWidth=38
-cols=4 clientWidth=44
-cols=5 clientWidth=50
-cols=10 clientWidth=81
-cols=20 clientWidth=142
-cols=50 clientWidth=325
-cols=100 clientWidth=631
-cols=500 clientWidth=3078
-cols=1000 clientWidth=6137
-
-Monaco
-input
-size=1 clientWidth=9
-size=2 clientWidth=15
-size=3 clientWidth=22
-size=4 clientWidth=28
-size=5 clientWidth=35
-size=10 clientWidth=68
-size=20 clientWidth=134
-size=50 clientWidth=332
-size=100 clientWidth=662
-size=500 clientWidth=3303
-size=1000 clientWidth=6603
-
-textarea
-cols=1 clientWidth=26
-cols=2 clientWidth=33
-cols=3 clientWidth=39
-cols=4 clientWidth=46
-cols=5 clientWidth=53
-cols=10 clientWidth=86
-cols=20 clientWidth=152
-cols=50 clientWidth=350
-cols=100 clientWidth=680
-cols=500 clientWidth=3320
-cols=1000 clientWidth=6621
-
-Times
-input
-size=1 clientWidth=8
-size=2 clientWidth=13
-size=3 clientWidth=19
-size=4 clientWidth=24
-size=5 clientWidth=30
-size=10 clientWidth=57
-size=20 clientWidth=112
-size=50 clientWidth=277
-size=100 clientWidth=552
-size=500 clientWidth=2752
-size=1000 clientWidth=5502
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=30
-cols=3 clientWidth=36
-cols=4 clientWidth=41
-cols=5 clientWidth=47
-cols=10 clientWidth=74
-cols=20 clientWidth=129
-cols=50 clientWidth=294
-cols=100 clientWidth=569
-cols=500 clientWidth=2769
-cols=1000 clientWidth=5519
-
-Andale Mono
-input
-size=1 clientWidth=9
-size=2 clientWidth=16
-size=3 clientWidth=23
-size=4 clientWidth=30
-size=5 clientWidth=37
-size=10 clientWidth=72
-size=20 clientWidth=142
-size=50 clientWidth=352
-size=100 clientWidth=702
-size=500 clientWidth=3502
-size=1000 clientWidth=7002
-
-textarea
-cols=1 clientWidth=26
-cols=2 clientWidth=33
-cols=3 clientWidth=40
-cols=4 clientWidth=47
-cols=5 clientWidth=54
-cols=10 clientWidth=89
-cols=20 clientWidth=159
-cols=50 clientWidth=369
-cols=100 clientWidth=719
-cols=500 clientWidth=3519
-cols=1000 clientWidth=7019
-
-Arial
-input
-size=1 clientWidth=31
-size=2 clientWidth=36
-size=3 clientWidth=41
-size=4 clientWidth=46
-size=5 clientWidth=51
-size=10 clientWidth=76
-size=20 clientWidth=126
-size=50 clientWidth=276
-size=100 clientWidth=526
-size=500 clientWidth=2526
-size=1000 clientWidth=5026
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=29
-cols=3 clientWidth=34
-cols=4 clientWidth=39
-cols=5 clientWidth=44
-cols=10 clientWidth=69
-cols=20 clientWidth=119
-cols=50 clientWidth=269
-cols=100 clientWidth=519
-cols=500 clientWidth=2519
-cols=1000 clientWidth=5019
-
-Comic Sans MS
-input
-size=1 clientWidth=16
-size=2 clientWidth=21
-size=3 clientWidth=26
-size=4 clientWidth=31
-size=5 clientWidth=36
-size=10 clientWidth=61
-size=20 clientWidth=111
-size=50 clientWidth=261
-size=100 clientWidth=511
-size=500 clientWidth=2511
-size=1000 clientWidth=5011
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=29
-cols=3 clientWidth=34
-cols=4 clientWidth=39
-cols=5 clientWidth=44
-cols=10 clientWidth=69
-cols=20 clientWidth=119
-cols=50 clientWidth=269
-cols=100 clientWidth=519
-cols=500 clientWidth=2519
-cols=1000 clientWidth=5019
-
-Courier New
-input
-size=1 clientWidth=10
-size=2 clientWidth=17
-size=3 clientWidth=24
-size=4 clientWidth=31
-size=5 clientWidth=38
-size=10 clientWidth=73
-size=20 clientWidth=143
-size=50 clientWidth=353
-size=100 clientWidth=703
-size=500 clientWidth=3503
-size=1000 clientWidth=7003
-
-textarea
-cols=1 clientWidth=26
-cols=2 clientWidth=33
-cols=3 clientWidth=40
-cols=4 clientWidth=47
-cols=5 clientWidth=54
-cols=10 clientWidth=89
-cols=20 clientWidth=159
-cols=50 clientWidth=369
-cols=100 clientWidth=719
-cols=500 clientWidth=3519
-cols=1000 clientWidth=7019
-
-Georgia
-input
-size=1 clientWidth=27
-size=2 clientWidth=32
-size=3 clientWidth=37
-size=4 clientWidth=42
-size=5 clientWidth=47
-size=10 clientWidth=72
-size=20 clientWidth=122
-size=50 clientWidth=272
-size=100 clientWidth=522
-size=500 clientWidth=2522
-size=1000 clientWidth=5022
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=29
-cols=3 clientWidth=34
-cols=4 clientWidth=39
-cols=5 clientWidth=44
-cols=10 clientWidth=69
-cols=20 clientWidth=119
-cols=50 clientWidth=269
-cols=100 clientWidth=519
-cols=500 clientWidth=2519
-cols=1000 clientWidth=5019
-
-Times New Roman
-input
-size=1 clientWidth=30
-size=2 clientWidth=34
-size=3 clientWidth=38
-size=4 clientWidth=42
-size=5 clientWidth=46
-size=10 clientWidth=66
-size=20 clientWidth=106
-size=50 clientWidth=226
-size=100 clientWidth=426
-size=500 clientWidth=2026
-size=1000 clientWidth=4026
-
-textarea
-cols=1 clientWidth=23
-cols=2 clientWidth=27
-cols=3 clientWidth=31
-cols=4 clientWidth=35
-cols=5 clientWidth=39
-cols=10 clientWidth=59
-cols=20 clientWidth=99
-cols=50 clientWidth=219
-cols=100 clientWidth=419
-cols=500 clientWidth=2019
-cols=1000 clientWidth=4019
-
-Trebuchet MS
-input
-size=1 clientWidth=15
-size=2 clientWidth=20
-size=3 clientWidth=25
-size=4 clientWidth=30
-size=5 clientWidth=35
-size=10 clientWidth=60
-size=20 clientWidth=110
-size=50 clientWidth=260
-size=100 clientWidth=510
-size=500 clientWidth=2510
-size=1000 clientWidth=5010
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=29
-cols=3 clientWidth=34
-cols=4 clientWidth=39
-cols=5 clientWidth=44
-cols=10 clientWidth=69
-cols=20 clientWidth=119
-cols=50 clientWidth=269
-cols=100 clientWidth=519
-cols=500 clientWidth=2519
-cols=1000 clientWidth=5019
-
-Verdana
-input
-size=1 clientWidth=23
-size=2 clientWidth=29
-size=3 clientWidth=35
-size=4 clientWidth=41
-size=5 clientWidth=47
-size=10 clientWidth=77
-size=20 clientWidth=137
-size=50 clientWidth=317
-size=100 clientWidth=617
-size=500 clientWidth=3017
-size=1000 clientWidth=6017
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=31
-cols=3 clientWidth=37
-cols=4 clientWidth=43
-cols=5 clientWidth=49
-cols=10 clientWidth=79
-cols=20 clientWidth=139
-cols=50 clientWidth=319
-cols=100 clientWidth=619
-cols=500 clientWidth=3019
-cols=1000 clientWidth=6019
-
-Webdings
-input
-size=1 clientWidth=46
-size=2 clientWidth=57
-size=3 clientWidth=68
-size=4 clientWidth=79
-size=5 clientWidth=90
-size=10 clientWidth=145
-size=20 clientWidth=255
-size=50 clientWidth=585
-size=100 clientWidth=1135
-size=500 clientWidth=5535
-size=1000 clientWidth=11035
-
-textarea
-cols=1 clientWidth=30
-cols=2 clientWidth=41
-cols=3 clientWidth=52
-cols=4 clientWidth=63
-cols=5 clientWidth=74
-cols=10 clientWidth=129
-cols=20 clientWidth=239
-cols=50 clientWidth=569
-cols=100 clientWidth=1119
-cols=500 clientWidth=5519
-cols=1000 clientWidth=11019
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Modified: trunk/Tools/ChangeLog (181568 => 181569)
--- trunk/Tools/ChangeLog 2015-03-16 18:23:54 UTC (rev 181568)
+++ trunk/Tools/ChangeLog 2015-03-16 18:30:34 UTC (rev 181569)
@@ -1,3 +1,20 @@
+2015-03-16 Alexey Proskuryakov <[email protected]>
+
+ [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 <[email protected]>
Created Streams API watchlist
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (181568 => 181569)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-03-16 18:23:54 UTC (rev 181568)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-03-16 18:30:34 UTC (rev 181569)
@@ -473,6 +473,48 @@
appKitAvailableFontsIMP = method_setImplementation(availableFontsMethod, (IMP)drt_NSFontManager_availableFonts);
}
+// 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()
{
static const char* fontFileNames[] = {
@@ -508,6 +550,7 @@
static void adjustFonts()
{
swizzleNSFontManagerMethods();
+ activateSystemCoreWebFonts();
activateTestingFonts();
}
#else
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm (181568 => 181569)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm 2015-03-16 18:23:54 UTC (rev 181568)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm 2015-03-16 18:30:34 UTC (rev 181569)
@@ -241,6 +241,48 @@
appKitAvailableFontsIMP = method_setImplementation(availableFontsMethod, (IMP)wtr_NSFontManager_availableFonts);
}
+// 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)
void activateFonts()
@@ -276,6 +318,7 @@
#if USE(APPKIT)
swizzleNSFontManagerMethods();
+ activateSystemCoreWebFonts();
#endif // USE(APPKIT)
}
