Test font-variant-* and font-feature-settings with mocked preinstalled fonts
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 11 Oct 2015 20:23:26 +0000 (20:23 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 11 Oct 2015 20:23:26 +0000 (20:23 +0000)
commitca23acfe1a7c53b961ea7959660daca8c7f0128c
treebf43e0b2e3bc8db6679aa3a4d8bc5b7fbb823e1a
parent8bfc02e13017f4b181638d5bf1b5684acb166143
Test font-variant-* and font-feature-settings with mocked preinstalled fonts
https://bugs.webkit.org/show_bug.cgi?id=149777

Reviewed by Simon Fraser.

Tools:

Include FontWithFeatures in DumpRenderTree and WebKitTestRunner. Add it
to the list of tests to preinstall at startup time.

Also, update the generation of the 'name' table in the FontWithFeatures font.

* DumpRenderTree/mac/DumpRenderTree.mm:
(allowedFontFamilySet):
(activateTestingFonts):
(activateFontsIOS):
* FontWithFeatures/FontWithFeatures/FontCreator.cpp:
(Generator::generate):
(Generator::appendCFFTable):
(Generator::appendNameSubtable):
(Generator::appendNAMETable):
* FontWithFeatures/FontWithFeatures/main.cpp:
(main):
* WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:
(WTR::allowedFontFamilySet):
(WTR::activateFonts):
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::allowedFontFamilySet):

LayoutTests:

See per-file comments.

* css3/font-feature-settings-preinstalled-fonts.html: Removed. Superseded by
css3/font-feature-settings-rendering.html.
* css3/font-feature-settings-rendering-2-expected.html: Removed.
* css3/font-feature-settings-rendering-2.html: Removed. Renamed to
css3/font-feature-settings-rendering.html
* css3/font-feature-settings-rendering-expected.html: Added.
* css3/font-feature-settings-rendering.html:
* css3/font-variant-all-expected.html:
* css3/font-variant-all.html:
* css3/resources/FontWithFeatures.otf: Update for new 'name' table.
* css3/resources/FontWithFeatures.ttf: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190848 268f45cc-cd09-0410-ab3c-d52691b4dbfc
38 files changed:
LayoutTests/ChangeLog
LayoutTests/css3/font-feature-settings-preinstalled-fonts.html [deleted file]
LayoutTests/css3/font-feature-settings-rendering-2-expected.html [deleted file]
LayoutTests/css3/font-feature-settings-rendering-2.html [deleted file]
LayoutTests/css3/font-feature-settings-rendering-expected.html [new file with mode: 0644]
LayoutTests/css3/font-feature-settings-rendering.html
LayoutTests/css3/font-variant-all-expected.html [new file with mode: 0644]
LayoutTests/css3/font-variant-all-webfont-expected.html [deleted file]
LayoutTests/css3/font-variant-all-webfont.html [deleted file]
LayoutTests/css3/font-variant-all.html [new file with mode: 0644]
LayoutTests/css3/resources/FontWithFeatures.otf
LayoutTests/css3/resources/FontWithFeatures.ttf
LayoutTests/platform/efl/TestExpectations
LayoutTests/platform/efl/css3/font-feature-settings-rendering-expected.png [deleted file]
LayoutTests/platform/efl/css3/font-feature-settings-rendering-expected.txt [deleted file]
LayoutTests/platform/gtk/css3/font-feature-settings-rendering-expected.png [deleted file]
LayoutTests/platform/gtk/css3/font-feature-settings-rendering-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/css3/font-feature-settings-preinstalled-fonts-expected.txt [deleted file]
LayoutTests/platform/ios-simulator/css3/font-feature-settings-rendering-expected.txt [deleted file]
LayoutTests/platform/mac-yosemite/css3/font-feature-settings-preinstalled-fonts-expected.txt [deleted file]
LayoutTests/platform/mac/TestExpectations
LayoutTests/platform/mac/css3/font-feature-settings-preinstalled-fonts-expected.png [deleted file]
LayoutTests/platform/mac/css3/font-feature-settings-preinstalled-fonts-expected.txt [deleted file]
LayoutTests/platform/win/TestExpectations
LayoutTests/platform/win/css3/font-feature-settings-preinstalled-fonts-expected.txt [deleted file]
Tools/ChangeLog
Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
Tools/DumpRenderTree/fonts/FontWithFeatures.otf [new file with mode: 0644]
Tools/DumpRenderTree/fonts/FontWithFeatures.ttf [new file with mode: 0644]
Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig
Tools/DumpRenderTree/mac/DumpRenderTree.mm
Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp
Tools/FontWithFeatures/FontWithFeatures/main.cpp
Tools/WebKitTestRunner/FontWithFeatures.otf [new file with mode: 0644]
Tools/WebKitTestRunner/FontWithFeatures.ttf [new file with mode: 0644]
Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm
Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
Tools/WebKitTestRunner/mac/TestControllerMac.mm