2010-07-13 Maciej Stachowiak <mjs@apple.com>
authormjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Jul 2010 10:02:52 +0000 (10:02 +0000)
committermjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Jul 2010 10:02:52 +0000 (10:02 +0000)
        Reviewed by Nikolas Zimmermann.

        Activate test fonts for layout tests in WebKitTestRunner (on Mac)
        https://bugs.webkit.org/show_bug.cgi?id=42153

        * WebKitTestRunner/InjectedBundle/ActivateFonts.h: Added.
        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
        (WTR::InjectedBundle::initialize): Activate fonts on startup.
        * WebKitTestRunner/InjectedBundle/mac: Added.
        * WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm: Added.
        (WTR::activateFonts): Activate our fonts.
        * WebKitTestRunner/InjectedBundle/win: Added.
        * WebKitTestRunner/InjectedBundle/win/ActivateFonts.cpp: Added.
        (WTR::activateFonts): Dummy version.
        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: Copy fonts to bundle;
        add more files.
        * WebKitTestRunner/fonts: Added.
        * WebKitTestRunner/fonts/AHEM____.TTF: Added.
        * WebKitTestRunner/fonts/ColorBits-A.png: Added.
        * WebKitTestRunner/fonts/ColorBits.ttf: Added.
        * WebKitTestRunner/fonts/WebKit Layout Tests 2.ttf: Added.
        * WebKitTestRunner/fonts/WebKit Layout Tests.ttf: Added.
        * WebKitTestRunner/fonts/WebKitWeightWatcher100.ttf: Added.
        * WebKitTestRunner/fonts/WebKitWeightWatcher200.ttf: Added.
        * WebKitTestRunner/fonts/WebKitWeightWatcher300.ttf: Added.
        * WebKitTestRunner/fonts/WebKitWeightWatcher400.ttf: Added.
        * WebKitTestRunner/fonts/WebKitWeightWatcher500.ttf: Added.
        * WebKitTestRunner/fonts/WebKitWeightWatcher600.ttf: Added.
        * WebKitTestRunner/fonts/WebKitWeightWatcher700.ttf: Added.
        * WebKitTestRunner/fonts/WebKitWeightWatcher800.ttf: Added.
        * WebKitTestRunner/fonts/WebKitWeightWatcher900.ttf: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63187 268f45cc-cd09-0410-ab3c-d52691b4dbfc

20 files changed:
WebKitTools/ChangeLog
WebKitTools/WebKitTestRunner/InjectedBundle/ActivateFonts.h [new file with mode: 0644]
WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
WebKitTools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm [new file with mode: 0644]
WebKitTools/WebKitTestRunner/InjectedBundle/win/ActivateFonts.cpp [new file with mode: 0644]
WebKitTools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
WebKitTools/WebKitTestRunner/fonts/AHEM____.TTF [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/ColorBits-A.png [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/ColorBits.ttf [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/WebKit Layout Tests 2.ttf [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/WebKit Layout Tests.ttf [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher100.ttf [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher200.ttf [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher300.ttf [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher400.ttf [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher500.ttf [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher600.ttf [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher700.ttf [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher800.ttf [new file with mode: 0644]
WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher900.ttf [new file with mode: 0644]

index 3eef62301b4800e1f8f60c8e2c265671e0d5e012..df11b39c8d0d53af01fb6bf5afaac2be06ab459d 100644 (file)
@@ -1,3 +1,37 @@
+2010-07-13  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Activate test fonts for layout tests in WebKitTestRunner (on Mac)
+        https://bugs.webkit.org/show_bug.cgi?id=42153
+
+        * WebKitTestRunner/InjectedBundle/ActivateFonts.h: Added.
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::initialize): Activate fonts on startup.
+        * WebKitTestRunner/InjectedBundle/mac: Added.
+        * WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm: Added.
+        (WTR::activateFonts): Activate our fonts.
+        * WebKitTestRunner/InjectedBundle/win: Added.
+        * WebKitTestRunner/InjectedBundle/win/ActivateFonts.cpp: Added.
+        (WTR::activateFonts): Dummy version.
+        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: Copy fonts to bundle;
+        add more files.
+        * WebKitTestRunner/fonts: Added.
+        * WebKitTestRunner/fonts/AHEM____.TTF: Added.
+        * WebKitTestRunner/fonts/ColorBits-A.png: Added.
+        * WebKitTestRunner/fonts/ColorBits.ttf: Added.
+        * WebKitTestRunner/fonts/WebKit Layout Tests 2.ttf: Added.
+        * WebKitTestRunner/fonts/WebKit Layout Tests.ttf: Added.
+        * WebKitTestRunner/fonts/WebKitWeightWatcher100.ttf: Added.
+        * WebKitTestRunner/fonts/WebKitWeightWatcher200.ttf: Added.
+        * WebKitTestRunner/fonts/WebKitWeightWatcher300.ttf: Added.
+        * WebKitTestRunner/fonts/WebKitWeightWatcher400.ttf: Added.
+        * WebKitTestRunner/fonts/WebKitWeightWatcher500.ttf: Added.
+        * WebKitTestRunner/fonts/WebKitWeightWatcher600.ttf: Added.
+        * WebKitTestRunner/fonts/WebKitWeightWatcher700.ttf: Added.
+        * WebKitTestRunner/fonts/WebKitWeightWatcher800.ttf: Added.
+        * WebKitTestRunner/fonts/WebKitWeightWatcher900.ttf: Added.
+
 2010-07-13  Dumitru Daniliuc  <dumi@chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/ActivateFonts.h b/WebKitTools/WebKitTestRunner/InjectedBundle/ActivateFonts.h
new file mode 100644 (file)
index 0000000..5ee1276
--- /dev/null
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ActivateFonts_h
+#define ActivateFonts_h
+
+namespace WTR {
+
+void activateFonts();
+
+} // namespace WTR
+
+#endif // ActivateFonts_h
index 9eea3e26a6e8f5a0cc1770d351fa755e812c74fc..d3c66fd1d74c1a86fb341cc94e79d2f0d3920816 100644 (file)
@@ -25,6 +25,7 @@
 
 #include "InjectedBundle.h"
 
+#include "ActivateFonts.h"
 #include "InjectedBundlePage.h"
 #include <WebKit2/WKBundle.h>
 #include <WebKit2/WKBundlePage.h>
@@ -73,6 +74,8 @@ void InjectedBundle::initialize(WKBundleRef bundle)
         _didRecieveMessage
     };
     WKBundleSetClient(m_bundle, &client);
+
+    activateFonts();
 }
 
 void InjectedBundle::done()
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm b/WebKitTools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm
new file mode 100644 (file)
index 0000000..b5bc4a1
--- /dev/null
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "ActivateFonts.h"
+
+#import <AppKit/AppKit.h>
+#import <CoreFoundation/CoreFoundation.h>
+#import <Foundation/Foundation.h>
+
+@interface WKTRFontActivatorDummyClass : NSObject
+@end
+
+@implementation WKTRFontActivatorDummyClass
+@end
+
+namespace WTR {
+
+void activateFonts()
+{
+    // Work around <rdar://problem/6698023> by activating fonts from disk
+
+    static const char* fontFileNames[] = {
+        "AHEM____.TTF",
+        "ColorBits.ttf",
+        "WebKitWeightWatcher100.ttf",
+        "WebKitWeightWatcher200.ttf",
+        "WebKitWeightWatcher300.ttf",
+        "WebKitWeightWatcher400.ttf",
+        "WebKitWeightWatcher500.ttf",
+        "WebKitWeightWatcher600.ttf",
+        "WebKitWeightWatcher700.ttf",
+        "WebKitWeightWatcher800.ttf",
+        "WebKitWeightWatcher900.ttf",
+        0
+    };
+
+    NSMutableArray *fontURLs = [NSMutableArray array];
+    NSURL *resourcesDirectory = [[NSBundle bundleForClass:[WKTRFontActivatorDummyClass class]] resourceURL];
+    for (unsigned i = 0; fontFileNames[i]; ++i) {
+        NSURL *fontURL = [resourcesDirectory URLByAppendingPathComponent:[NSString stringWithUTF8String:fontFileNames[i]]];
+        [fontURLs addObject:[fontURL absoluteURL]];
+    }
+
+    CFArrayRef errors = 0;
+    if (!CTFontManagerRegisterFontsForURLs((CFArrayRef)fontURLs, kCTFontManagerScopeProcess, &errors)) {
+        NSLog(@"Failed to activate fonts: %@", errors);
+        CFRelease(errors);
+        exit(1);
+    }
+}
+
+}
+
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/win/ActivateFonts.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/win/ActivateFonts.cpp
new file mode 100644 (file)
index 0000000..c7532ce
--- /dev/null
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "ActivateFonts.h"
+
+namespace WTR {
+
+void activateFonts()
+{
+    // FIXME: Not implemented.
+}
+
+}
index caf26a4d5fb056f81cb889835ca6200ccea0a930..080d37052d6b5f1dafd0bfdacf6cae3339137739 100644 (file)
@@ -7,6 +7,18 @@
        objects = {
 
 /* Begin PBXBuildFile section */
+               6510A78211EC643800410867 /* AHEM____.TTF in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77711EC643800410867 /* AHEM____.TTF */; };
+               6510A78311EC643800410867 /* ColorBits.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77811EC643800410867 /* ColorBits.ttf */; };
+               6510A78411EC643800410867 /* WebKitWeightWatcher100.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77911EC643800410867 /* WebKitWeightWatcher100.ttf */; };
+               6510A78511EC643800410867 /* WebKitWeightWatcher200.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77A11EC643800410867 /* WebKitWeightWatcher200.ttf */; };
+               6510A78611EC643800410867 /* WebKitWeightWatcher300.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77B11EC643800410867 /* WebKitWeightWatcher300.ttf */; };
+               6510A78711EC643800410867 /* WebKitWeightWatcher400.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77C11EC643800410867 /* WebKitWeightWatcher400.ttf */; };
+               6510A78811EC643800410867 /* WebKitWeightWatcher500.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77D11EC643800410867 /* WebKitWeightWatcher500.ttf */; };
+               6510A78911EC643800410867 /* WebKitWeightWatcher600.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77E11EC643800410867 /* WebKitWeightWatcher600.ttf */; };
+               6510A78A11EC643800410867 /* WebKitWeightWatcher700.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77F11EC643800410867 /* WebKitWeightWatcher700.ttf */; };
+               6510A78B11EC643800410867 /* WebKitWeightWatcher800.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A78011EC643800410867 /* WebKitWeightWatcher800.ttf */; };
+               6510A78C11EC643800410867 /* WebKitWeightWatcher900.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A78111EC643800410867 /* WebKitWeightWatcher900.ttf */; };
+               65EB85A011EC67CC0034D300 /* ActivateFonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65EB859F11EC67CC0034D300 /* ActivateFonts.mm */; };
                BC25193E11D15D8B002EBC01 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC7934A411906584005EA8E2 /* Cocoa.framework */; };
                BC25193F11D15D8B002EBC01 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC7934AB1190658C005EA8E2 /* WebKit2.framework */; };
                BC25194011D15D8B002EBC01 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCDA2B991191051F00C3BC47 /* JavaScriptCore.framework */; };
                };
 /* End PBXContainerItemProxy section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-               8DD76F9E0486AA7600D96B5E /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
-               };
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
+               6510A77711EC643800410867 /* AHEM____.TTF */ = {isa = PBXFileReference; lastKnownFileType = file; name = "AHEM____.TTF"; path = "fonts/AHEM____.TTF"; sourceTree = "<group>"; };
+               6510A77811EC643800410867 /* ColorBits.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ColorBits.ttf; path = fonts/ColorBits.ttf; sourceTree = "<group>"; };
+               6510A77911EC643800410867 /* WebKitWeightWatcher100.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher100.ttf; path = fonts/WebKitWeightWatcher100.ttf; sourceTree = "<group>"; };
+               6510A77A11EC643800410867 /* WebKitWeightWatcher200.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher200.ttf; path = fonts/WebKitWeightWatcher200.ttf; sourceTree = "<group>"; };
+               6510A77B11EC643800410867 /* WebKitWeightWatcher300.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher300.ttf; path = fonts/WebKitWeightWatcher300.ttf; sourceTree = "<group>"; };
+               6510A77C11EC643800410867 /* WebKitWeightWatcher400.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher400.ttf; path = fonts/WebKitWeightWatcher400.ttf; sourceTree = "<group>"; };
+               6510A77D11EC643800410867 /* WebKitWeightWatcher500.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher500.ttf; path = fonts/WebKitWeightWatcher500.ttf; sourceTree = "<group>"; };
+               6510A77E11EC643800410867 /* WebKitWeightWatcher600.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher600.ttf; path = fonts/WebKitWeightWatcher600.ttf; sourceTree = "<group>"; };
+               6510A77F11EC643800410867 /* WebKitWeightWatcher700.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher700.ttf; path = fonts/WebKitWeightWatcher700.ttf; sourceTree = "<group>"; };
+               6510A78011EC643800410867 /* WebKitWeightWatcher800.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher800.ttf; path = fonts/WebKitWeightWatcher800.ttf; sourceTree = "<group>"; };
+               6510A78111EC643800410867 /* WebKitWeightWatcher900.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher900.ttf; path = fonts/WebKitWeightWatcher900.ttf; sourceTree = "<group>"; };
+               65EB859D11EC67CC0034D300 /* ActivateFonts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivateFonts.h; sourceTree = "<group>"; };
+               65EB859F11EC67CC0034D300 /* ActivateFonts.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ActivateFonts.mm; sourceTree = "<group>"; };
                8DD76FA10486AA7600D96B5E /* WebKitTestRunner */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = WebKitTestRunner; sourceTree = BUILT_PRODUCTS_DIR; };
                BC25184611D15767002EBC01 /* InjectedBundleMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleMain.cpp; sourceTree = "<group>"; };
                BC25186211D15D54002EBC01 /* InjectedBundle.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = InjectedBundle.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                        name = Products;
                        sourceTree = "<group>";
                };
+               65EB859E11EC67CC0034D300 /* mac */ = {
+                       isa = PBXGroup;
+                       children = (
+                               65EB859F11EC67CC0034D300 /* ActivateFonts.mm */,
+                       );
+                       path = mac;
+                       sourceTree = "<group>";
+               };
                BC25183511D1571D002EBC01 /* InjectedBundle */ = {
                        isa = PBXGroup;
                        children = (
                                BCC997A011D3C8F60017BCA2 /* InjectedBundle.cpp */,
+                               65EB859D11EC67CC0034D300 /* ActivateFonts.h */,
+                               65EB859E11EC67CC0034D300 /* mac */,
                                BCC997A111D3C8F60017BCA2 /* InjectedBundle.h */,
                                BC25184611D15767002EBC01 /* InjectedBundleMain.cpp */,
                                BCC997A211D3C8F60017BCA2 /* InjectedBundlePage.cpp */,
                        isa = PBXGroup;
                        children = (
                                BC25186311D15D54002EBC01 /* InjectedBundle-Info.plist */,
+                               6510A77711EC643800410867 /* AHEM____.TTF */,
+                               6510A77811EC643800410867 /* ColorBits.ttf */,
+                               6510A77911EC643800410867 /* WebKitWeightWatcher100.ttf */,
+                               6510A77A11EC643800410867 /* WebKitWeightWatcher200.ttf */,
+                               6510A77B11EC643800410867 /* WebKitWeightWatcher300.ttf */,
+                               6510A77C11EC643800410867 /* WebKitWeightWatcher400.ttf */,
+                               6510A77D11EC643800410867 /* WebKitWeightWatcher500.ttf */,
+                               6510A77E11EC643800410867 /* WebKitWeightWatcher600.ttf */,
+                               6510A77F11EC643800410867 /* WebKitWeightWatcher700.ttf */,
+                               6510A78011EC643800410867 /* WebKitWeightWatcher800.ttf */,
+                               6510A78111EC643800410867 /* WebKitWeightWatcher900.ttf */,
                        );
                        name = Resources;
                        sourceTree = "<group>";
                        buildPhases = (
                                8DD76F990486AA7600D96B5E /* Sources */,
                                8DD76F9B0486AA7600D96B5E /* Frameworks */,
-                               8DD76F9E0486AA7600D96B5E /* CopyFiles */,
                        );
                        buildRules = (
                        );
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               6510A78211EC643800410867 /* AHEM____.TTF in Resources */,
+                               6510A78311EC643800410867 /* ColorBits.ttf in Resources */,
+                               6510A78411EC643800410867 /* WebKitWeightWatcher100.ttf in Resources */,
+                               6510A78511EC643800410867 /* WebKitWeightWatcher200.ttf in Resources */,
+                               6510A78611EC643800410867 /* WebKitWeightWatcher300.ttf in Resources */,
+                               6510A78711EC643800410867 /* WebKitWeightWatcher400.ttf in Resources */,
+                               6510A78811EC643800410867 /* WebKitWeightWatcher500.ttf in Resources */,
+                               6510A78911EC643800410867 /* WebKitWeightWatcher600.ttf in Resources */,
+                               6510A78A11EC643800410867 /* WebKitWeightWatcher700.ttf in Resources */,
+                               6510A78B11EC643800410867 /* WebKitWeightWatcher800.ttf in Resources */,
+                               6510A78C11EC643800410867 /* WebKitWeightWatcher900.ttf in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                BCC997A411D3C8F60017BCA2 /* InjectedBundle.cpp in Sources */,
                                BCC997A511D3C8F60017BCA2 /* InjectedBundlePage.cpp in Sources */,
                                BCC9981811D3F51E0017BCA2 /* LayoutTestController.cpp in Sources */,
+                               65EB85A011EC67CC0034D300 /* ActivateFonts.mm in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
diff --git a/WebKitTools/WebKitTestRunner/fonts/AHEM____.TTF b/WebKitTools/WebKitTestRunner/fonts/AHEM____.TTF
new file mode 100644 (file)
index 0000000..ac81cb0
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/AHEM____.TTF differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/ColorBits-A.png b/WebKitTools/WebKitTestRunner/fonts/ColorBits-A.png
new file mode 100644 (file)
index 0000000..8b9319c
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/ColorBits-A.png differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/ColorBits.ttf b/WebKitTools/WebKitTestRunner/fonts/ColorBits.ttf
new file mode 100644 (file)
index 0000000..cd919e8
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/ColorBits.ttf differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/WebKit Layout Tests 2.ttf b/WebKitTools/WebKitTestRunner/fonts/WebKit Layout Tests 2.ttf
new file mode 100644 (file)
index 0000000..e732fbc
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/WebKit Layout Tests 2.ttf differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/WebKit Layout Tests.ttf b/WebKitTools/WebKitTestRunner/fonts/WebKit Layout Tests.ttf
new file mode 100644 (file)
index 0000000..f9f997e
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/WebKit Layout Tests.ttf differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher100.ttf b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher100.ttf
new file mode 100644 (file)
index 0000000..22b00de
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher100.ttf differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher200.ttf b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher200.ttf
new file mode 100644 (file)
index 0000000..1ccadba
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher200.ttf differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher300.ttf b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher300.ttf
new file mode 100644 (file)
index 0000000..ab5563d
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher300.ttf differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher400.ttf b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher400.ttf
new file mode 100644 (file)
index 0000000..56d279e
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher400.ttf differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher500.ttf b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher500.ttf
new file mode 100644 (file)
index 0000000..d827d7d
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher500.ttf differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher600.ttf b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher600.ttf
new file mode 100644 (file)
index 0000000..9141596
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher600.ttf differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher700.ttf b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher700.ttf
new file mode 100644 (file)
index 0000000..a2d0505
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher700.ttf differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher800.ttf b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher800.ttf
new file mode 100644 (file)
index 0000000..d0f354b
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher800.ttf differ
diff --git a/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher900.ttf b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher900.ttf
new file mode 100644 (file)
index 0000000..6b895ca
Binary files /dev/null and b/WebKitTools/WebKitTestRunner/fonts/WebKitWeightWatcher900.ttf differ