diff options
| author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 23:52:45 +0000 |
|---|---|---|
| committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 23:52:45 +0000 |
| commit | 00c1fc7aa82783a1f24ea55922990ee38e041e35 (patch) | |
| tree | 715e7e59d94d081de1cb84efd1f942c88845c6bb | |
| parent | 84fc257d854d223fe084618710e4f24d26a43f91 (diff) | |
| download | chromium_src-00c1fc7aa82783a1f24ea55922990ee38e041e35.zip chromium_src-00c1fc7aa82783a1f24ea55922990ee38e041e35.tar.gz chromium_src-00c1fc7aa82783a1f24ea55922990ee38e041e35.tar.bz2 | |
Don't register WebKitWeightWatcher fonts
Registering many fonts causes a probelm. We don't register them at
this moment.
BUG=http://webkit.org/b/50709
TEST=LayoutTests/fast/css/font-weight-1.html
Review URL: http://codereview.chromium.org/6287039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73378 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/support/platform_support_mac.mm | 11 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm index ef568bd..4ae9bb17 100644 --- a/webkit/support/platform_support_mac.mm +++ b/webkit/support/platform_support_mac.mm @@ -114,15 +114,8 @@ void AfterInitialize(bool unit_test_mode) { // Load font files in the resource folder. static const char* const fontFileNames[] = { "AHEM____.TTF", - "WebKitWeightWatcher100.ttf", - "WebKitWeightWatcher200.ttf", - "WebKitWeightWatcher300.ttf", - "WebKitWeightWatcher400.ttf", - "WebKitWeightWatcher500.ttf", - "WebKitWeightWatcher600.ttf", - "WebKitWeightWatcher700.ttf", - "WebKitWeightWatcher800.ttf", - "WebKitWeightWatcher900.ttf", + // We don't register WebKitWeightWather fonts because of + // webkit.org/b/50709. }; NSString* resources = [[NSBundle mainBundle] resourcePath]; diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 0ca4cc3..628ffa3 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -4,3 +4,7 @@ // // Only add expectations here to temporarily suppress messages on the bots // until the changes can be landed upstream. + +// Registering the fonts for this test causes other processes (Adium, Firefox) +// to spin and become unresponsive or crash. +BUGWK50709 MAC : fast/css/font-weight-1.html = IMAGE+TEXT |