summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordominik.rottsches@intel.com <dominik.rottsches@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-20 22:04:47 +0000
committerdominik.rottsches@intel.com <dominik.rottsches@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-20 22:04:47 +0000
commit2468780dfe432b4b6f1cb91af6b31230a88529a6 (patch)
tree7ba12b0ac2db950e7a27b467dc76fb2ec61382cb
parenta3798fd35441409ca379f2a86025980f5d5cf3fb (diff)
downloadchromium_src-2468780dfe432b4b6f1cb91af6b31230a88529a6.zip
chromium_src-2468780dfe432b4b6f1cb91af6b31230a88529a6.tar.gz
chromium_src-2468780dfe432b4b6f1cb91af6b31230a88529a6.tar.bz2
Add ChromiumAATTest for testing AAT font support in the shaper
TBR=avi@chromium.org BUG=354497 TEST=NONE Review URL: https://codereview.chromium.org/206253006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258429 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/content_shell.gypi1
-rw-r--r--content/shell/app/webkit_test_platform_support_mac.mm2
-rw-r--r--content/shell/renderer/test_runner/resources/fonts/ChromiumAATTest.ttfbin0 -> 3020 bytes
3 files changed, 2 insertions, 1 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 0969e9e..9290d49 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -408,6 +408,7 @@
'all_dependent_settings': {
'mac_bundle_resources': [
'shell/renderer/test_runner/resources/fonts/AHEM____.TTF',
+ 'shell/renderer/test_runner/resources/fonts/ChromiumAATTest.ttf',
'<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png',
'<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
],
diff --git a/content/shell/app/webkit_test_platform_support_mac.mm b/content/shell/app/webkit_test_platform_support_mac.mm
index 8847941..bc042f9 100644
--- a/content/shell/app/webkit_test_platform_support_mac.mm
+++ b/content/shell/app/webkit_test_platform_support_mac.mm
@@ -54,7 +54,7 @@ bool WebKitTestPlatformInitialize() {
// Load font files in the resource folder.
static const char* const fontFileNames[] = {
- "AHEM____.TTF",
+ "AHEM____.TTF", "ChromiumAATTest.ttf"
};
// mainBundle is Content Shell Helper.app. Go two levels up to find
diff --git a/content/shell/renderer/test_runner/resources/fonts/ChromiumAATTest.ttf b/content/shell/renderer/test_runner/resources/fonts/ChromiumAATTest.ttf
new file mode 100644
index 0000000..343d53a
--- /dev/null
+++ b/content/shell/renderer/test_runner/resources/fonts/ChromiumAATTest.ttf
Binary files differ