Diff
Modified: trunk/LayoutTests/ChangeLog (99126 => 99127)
--- trunk/LayoutTests/ChangeLog 2011-11-03 00:25:45 UTC (rev 99126)
+++ trunk/LayoutTests/ChangeLog 2011-11-03 00:55:00 UTC (rev 99127)
@@ -1,3 +1,18 @@
+2011-11-02 Dan Bernstein <m...@apple.com>
+
+ REGRESSION (r98759-r98773): platform/mac/fonts/color-bitmap.html failing on Lion Intel Debug (Tests)
+ https://bugs.webkit.org/show_bug.cgi?id=71424
+
+ Reviewed by Sam Weinig.
+
+ Removed this test and its results, because it was relying on a feature
+ that is no longer present in any OS X version. The color bitmap font
+ rendering code is now covered by another test.
+
+ * platform/mac/fonts/color-bitmap-expected.png: Removed.
+ * platform/mac/fonts/color-bitmap-expected.txt: Removed.
+ * platform/mac/fonts/color-bitmap.html: Removed.
+
2011-11-02 Simon Fraser <simon.fra...@apple.com>
REGRESSION (r97496-r97499): 6 fast/workers tests failing on SnowLeopard Intel Release (Tests)
Deleted: trunk/LayoutTests/platform/mac/fonts/color-bitmap-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/fonts/color-bitmap-expected.txt (99126 => 99127)
--- trunk/LayoutTests/platform/mac/fonts/color-bitmap-expected.txt 2011-11-03 00:25:45 UTC (rev 99126)
+++ trunk/LayoutTests/platform/mac/fonts/color-bitmap-expected.txt 2011-11-03 00:55:00 UTC (rev 99127)
@@ -1,17 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x552
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 601x18
- text run at (0,0) width 601: "This tests color bitmap font rendering. There should be a green dot below, enclosed in brackets."
- RenderBlock {P} at (0,38) size 784x20
- RenderText {#text} at (0,0) size 48x20
- text run at (0,0) width 48: "[A]"
- RenderBlock {P} at (0,78) size 784x18
- RenderText {#text} at (0,0) size 466x18
- text run at (0,0) width 466: "This should be a bigger, pixelated version of the dot, enclosed in brackets:"
- RenderBlock {P} at (0,136) size 784x40
- RenderText {#text} at (0,0) size 96x40
- text run at (0,0) width 96: "[A]"
Deleted: trunk/LayoutTests/platform/mac/fonts/color-bitmap.html (99126 => 99127)
--- trunk/LayoutTests/platform/mac/fonts/color-bitmap.html 2011-11-03 00:25:45 UTC (rev 99126)
+++ trunk/LayoutTests/platform/mac/fonts/color-bitmap.html 2011-11-03 00:55:00 UTC (rev 99127)
@@ -1,12 +0,0 @@
-<p>
- This tests color bitmap font rendering. There should be a green dot below, enclosed in brackets.
-</p>
-<p style="font-size: 20px; font-family: colorbits">
- [A]
-</p>
-<p>
- This should be a bigger, pixelated version of the dot, enclosed in brackets:
-</p>
-<p style="font-size: 40px; font-family: colorbits">
- [A]
-</p>
Modified: trunk/Tools/ChangeLog (99126 => 99127)
--- trunk/Tools/ChangeLog 2011-11-03 00:25:45 UTC (rev 99126)
+++ trunk/Tools/ChangeLog 2011-11-03 00:55:00 UTC (rev 99127)
@@ -1,5 +1,27 @@
2011-11-02 Dan Bernstein <m...@apple.com>
+ REGRESSION (r98759-r98773): platform/mac/fonts/color-bitmap.html failing on Lion Intel Debug (Tests)
+ https://bugs.webkit.org/show_bug.cgi?id=71424
+
+ Reviewed by Sam Weinig.
+
+ Removed the ColorBits font and the code to register it in the process
+ running the tests. The font was only used by the aforementioned test,
+ which is now being removed.
+
+ * DumpRenderTree/fonts/ColorBits-A.png: Removed.
+ * DumpRenderTree/fonts/ColorBits.ttf: Removed.
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (allowedFontFamilySet):
+ (activateTestingFonts):
+ * WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
+ (WTR::inititializeFontConfigSetting):
+ * WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:
+ (WTR::allowedFontFamilySet):
+ (WTR::activateFonts):
+
+2011-11-02 Dan Bernstein <m...@apple.com>
+
Fix an intermittent hang in RenderedImageFromDOMRange.
Reviewed by Anders Carlsson.
Deleted: trunk/Tools/DumpRenderTree/fonts/ColorBits-A.png
(Binary files differ)
Deleted: trunk/Tools/DumpRenderTree/fonts/ColorBits.ttf
(Binary files differ)
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (99126 => 99127)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2011-11-03 00:25:45 UTC (rev 99126)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2011-11-03 00:55:00 UTC (rev 99127)
@@ -253,7 +253,6 @@
@"Chalkduster",
@"Charcoal CY",
@"Cochin",
- @"ColorBits",
@"Comic Sans MS",
@"Copperplate",
@"Corsiva Hebrew",
@@ -407,7 +406,6 @@
static const char* fontFileNames[] = {
"AHEM____.TTF",
- "ColorBits.ttf",
"WebKitWeightWatcher100.ttf",
"WebKitWeightWatcher200.ttf",
"WebKitWeightWatcher300.ttf",
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp (99126 => 99127)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2011-11-03 00:25:45 UTC (rev 99126)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2011-11-03 00:55:00 UTC (rev 99127)
@@ -140,7 +140,6 @@
g_error("Could not load font at %s!", ahemFontFilename.get());
static const char* fontFilenames[] = {
- "ColorBits.ttf",
"WebKitWeightWatcher100.ttf",
"WebKitWeightWatcher200.ttf",
"WebKitWeightWatcher300.ttf",
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm (99126 => 99127)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm 2011-11-03 00:25:45 UTC (rev 99126)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm 2011-11-03 00:55:00 UTC (rev 99127)
@@ -72,7 +72,6 @@
@"Chalkduster",
@"Charcoal CY",
@"Cochin",
- @"ColorBits",
@"Comic Sans MS",
@"Copperplate",
@"Corsiva Hebrew",
@@ -225,7 +224,6 @@
static const char* fontFileNames[] = {
"AHEM____.TTF",
- "ColorBits.ttf",
"WebKitWeightWatcher100.ttf",
"WebKitWeightWatcher200.ttf",
"WebKitWeightWatcher300.ttf",
