Changeset 64601 in webkit

Timestamp:

Aug 3, 2010 3:55:12 PM (14 years ago)

Author:

jhoneycutt@apple.com

Message:

WebKitTestRunner needs to support loading custom fonts (via the
WEBKIT_TESTFONTS environment variable)
​https://bugs.webkit.org/show_bug.cgi?id=42782

Reviewed by Adam Roben.

• WebKitTestRunner/InjectedBundle/win/ActivateFonts.cpp:

(WTR::fontsPath):
Copied from DRT code. Removed the fallback to DumpRenderTree.resources/,
as this directory doesn't appear to be created anymore.
(WTR::activateFonts):
Loop through the fonts, and call AddFontResourceExW() for each.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/win/ActivateFonts.cpp (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ -135 +135 @@
 
         * Scripts/old-run-webkit-tests:
+
+2010-08-02  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        WebKitTestRunner needs to support loading custom fonts (via the
+        WEBKIT_TESTFONTS environment variable)
+        https://bugs.webkit.org/show_bug.cgi?id=42782
+
+        Reviewed by Adam Roben.
+
+        * WebKitTestRunner/InjectedBundle/win/ActivateFonts.cpp:
+        (WTR::fontsPath):
+        Copied from DRT code. Removed the fallback to DumpRenderTree.resources/,
+        as this directory doesn't appear to be created anymore.
+        (WTR::activateFonts):
+        Loop through the fonts, and call AddFontResourceExW() for each.
 
 2010-08-02  Jon Honeycutt  <jhoneycutt@apple.com>

trunk/WebKitTools/WebKitTestRunner/InjectedBundle/win/ActivateFonts.cpp

@@ -26 +26 @@
 #include "ActivateFonts.h"
 
+#include <string>
+#include <wtf/Vector.h>
+
+static LPCWSTR fontsEnvironmentVariable = L"WEBKIT_TESTFONTS";
+
 namespace WTR {
+
+using namespace std;
+
+static const wstring& fontsPath()
+{
+    static wstring path;
+    static bool initialized;
+
+    if (initialized)
+        return path;
+    initialized = true;
+
+    DWORD size = ::GetEnvironmentVariableW(fontsEnvironmentVariable, 0, 0);
+    Vector<WCHAR> buffer(size);
+    if (!::GetEnvironmentVariableW(fontsEnvironmentVariable, buffer.data(), buffer.size()))
+        return path;
+
+    path = buffer.data();
+    if (path[path.length() - 1] != '\\')
+        path.append(L"\\");
+
+    return path;
+}
+
 
 void activateFonts()
 {
-    // FIXME: Not implemented.
+    static LPCWSTR fontsToInstall[] = {
+        TEXT("AHEM____.ttf"),
+        TEXT("Apple Chancery.ttf"),
+        TEXT("Courier Bold.ttf"),
+        TEXT("Courier.ttf"),
+        TEXT("Helvetica Bold Oblique.ttf"),
+        TEXT("Helvetica Bold.ttf"),
+        TEXT("Helvetica Oblique.ttf"),
+        TEXT("Helvetica.ttf"),
+        TEXT("Helvetica Neue Bold Italic.ttf"),
+        TEXT("Helvetica Neue Bold.ttf"),
+        TEXT("Helvetica Neue Condensed Black.ttf"),
+        TEXT("Helvetica Neue Condensed Bold.ttf"),
+        TEXT("Helvetica Neue Italic.ttf"),
+        TEXT("Helvetica Neue Light Italic.ttf"),
+        TEXT("Helvetica Neue Light.ttf"),
+        TEXT("Helvetica Neue UltraLight Italic.ttf"),
+        TEXT("Helvetica Neue UltraLight.ttf"),
+        TEXT("Helvetica Neue.ttf"),
+        TEXT("Lucida Grande.ttf"),
+        TEXT("Lucida Grande Bold.ttf"),
+        TEXT("Monaco.ttf"),
+        TEXT("Papyrus.ttf"),
+        TEXT("Times Bold Italic.ttf"),
+        TEXT("Times Bold.ttf"),
+        TEXT("Times Italic.ttf"),
+        TEXT("Times Roman.ttf"),
+        TEXT("WebKit Layout Tests 2.ttf"),
+        TEXT("WebKit Layout Tests.ttf"),
+        TEXT("WebKitWeightWatcher100.ttf"),
+        TEXT("WebKitWeightWatcher200.ttf"),
+        TEXT("WebKitWeightWatcher300.ttf"),
+        TEXT("WebKitWeightWatcher400.ttf"),
+        TEXT("WebKitWeightWatcher500.ttf"),
+        TEXT("WebKitWeightWatcher600.ttf"),
+        TEXT("WebKitWeightWatcher700.ttf"),
+        TEXT("WebKitWeightWatcher800.ttf"),
+        TEXT("WebKitWeightWatcher900.ttf")
+    };
+
+    wstring resourcesPath = fontsPath();
+
+    for (unsigned i = 0; i < ARRAYSIZE(fontsToInstall); ++i)
+        ::AddFontResourceExW(wstring(resourcesPath + fontsToInstall[i]).c_str(), FR_PRIVATE, 0);
 }