Commit c2442f9e authored by mrobinson@webkit.org's avatar mrobinson@webkit.org
Browse files

2011-02-15 Martin Robinson <mrobinson@igalia.com>

        Reviewed by Xan Lopez.

        [Freetype] Better map CSS font weight to Fontconfig font weight
        https://bugs.webkit.org/show_bug.cgi?id=54323

        Update the results of this test, which is now passing. Also update results for
        all other tests which have different results now.

        * platform/gtk/fast/css/font-weight-1-expected.checksum:
        * platform/gtk/fast/css/font-weight-1-expected.png:
        * platform/gtk/fast/css/font-weight-1-expected.txt:
2011-02-15  Martin Robinson  <mrobinson@igalia.com>

        Reviewed by Xan Lopez.

        [Freetype] Better map CSS font weight to Fontconfig font weight
        https://bugs.webkit.org/show_bug.cgi?id=54323

        * platform/graphics/freetype/FontCacheFreeType.cpp:
        (WebCore::fontWeightToFontconfigWeight): Added this helper to map between CSS and
        Fontconfig font weights.
        (WebCore::FontCache::createFontPlatformData): Use the new helper instead of just
        deciding between bold and regular.
2011-02-15  Martin Robinson  <mrobinson@igalia.com>

        Reviewed by Xan Lopez.

        [Freetype] Better map CSS font weight to Fontconfig font weight
        https://bugs.webkit.org/show_bug.cgi?id=54323

        Add the WeightWatcher fonts to the list of sourced fonts when intializing
        DRT. This will allow us to pass tests that use WeightWatcher.

        * DumpRenderTree/gtk/DumpRenderTree.cpp:
        (initializeFonts): Source the WebkitWeightWatcher fonts.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78614 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent cbcf89a3
2011-02-15 Martin Robinson <mrobinson@igalia.com>
Reviewed by Xan Lopez.
[Freetype] Better map CSS font weight to Fontconfig font weight
https://bugs.webkit.org/show_bug.cgi?id=54323
Update the results of this test, which is now passing. Also update results for
all other tests which have different results now.
* platform/gtk/fast/css/font-weight-1-expected.checksum:
* platform/gtk/fast/css/font-weight-1-expected.png:
* platform/gtk/fast/css/font-weight-1-expected.txt:
2011-02-15 Mihai Parparita <mihaip@chromium.org>
 
Unreviewed chromium-gpu-linux rebaseline. Check in correct expectations
e96acfd5fc9307a48f077ac4e787bc44
\ No newline at end of file
75d0edcc63c458e54e59c06ac43f45ad
\ No newline at end of file
493dadad4c3302b5686cc99be7f81e43
\ No newline at end of file
fd43db967dbf256931e6d91e1b0340e1
\ No newline at end of file
007be2afa6a3769ef298f81fa0a43398
\ No newline at end of file
a53b80484180744adc341e41e32a91dc
\ No newline at end of file
......@@ -19,7 +19,7 @@ layer at (0,0) size 800x600
RenderText {#text} at (384,2) size 290x19
text run at (384,2) width 290: "Papyrus syn. bold syn. italic"
RenderText {#text} at (0,0) size 0x0
RenderBlock {DIV} at (4,61) size 776x41 [border: (1px solid #ADD8E6)]
RenderBlock {DIV} at (4,61) size 776x42 [border: (1px solid #ADD8E6)]
RenderInline {SPAN} at (0,0) size 70x19
RenderText {#text} at (1,2) size 70x19
text run at (1,2) width 70: "Courier"
......@@ -45,25 +45,27 @@ layer at (0,0) size 800x600
text run at (321,2) width 70: "Courier"
RenderText {#text} at (391,2) size 10x19
text run at (391,2) width 10: " "
RenderInline {SPAN} at (0,0) size 104x19
RenderText {#text} at (401,1) size 104x19
text run at (401,1) width 104: "Helvetica Bold"
RenderText {#text} at (505,2) size 10x19
text run at (505,2) width 10: " "
RenderInline {SPAN} at (0,0) size 110x19
RenderText {#text} at (515,1) size 110x19
text run at (515,1) width 110: "Helvetica Bold"
RenderText {#text} at (625,2) size 10x19
text run at (625,2) width 10: " "
RenderInline {SPAN} at (0,0) size 138x19
RenderText {#text} at (635,1) size 138x19
text run at (635,1) width 138: "Papyrus syn. bold"
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (401,1) size 110x19
text run at (401,1) width 110: "Helvetica Bold"
RenderText {#text} at (511,2) size 10x19
text run at (511,2) width 10: " "
RenderInline {SPAN} at (0,0) size 110x19
RenderText {#text} at (521,1) size 110x19
text run at (521,1) width 110: "Helvetica Bold"
RenderText {#text} at (631,2) size 10x19
text run at (631,2) width 10: " "
RenderInline {SPAN} at (0,0) size 740x39
RenderText {#text} at (641,1) size 740x39
text run at (641,1) width 100: "Papyrus syn."
text run at (1,21) width 34: "bold"
RenderText {#text} at (35,22) size 10x19
text run at (35,22) width 10: " "
RenderInline {SPAN} at (0,0) size 138x19
RenderText {#text} at (1,21) size 138x19
text run at (1,21) width 138: "Papyrus syn. bold"
RenderText {#text} at (45,21) size 138x19
text run at (45,21) width 138: "Papyrus syn. bold"
RenderText {#text} at (0,0) size 0x0
RenderBlock {DIV} at (4,106) size 776x41 [border: (1px solid #ADD8E6)]
RenderBlock {DIV} at (4,107) size 776x41 [border: (1px solid #ADD8E6)]
RenderInline {SPAN} at (0,0) size 70x19
RenderText {#text} at (1,2) size 70x19
text run at (1,2) width 70: "Courier"
......@@ -89,25 +91,25 @@ layer at (0,0) size 800x600
text run at (321,2) width 70: "Courier"
RenderText {#text} at (391,2) size 10x19
text run at (391,2) width 10: " "
RenderInline {SPAN} at (0,0) size 104x19
RenderText {#text} at (401,1) size 104x19
text run at (401,1) width 104: "Helvetica Bold"
RenderText {#text} at (505,2) size 10x19
text run at (505,2) width 10: " "
RenderInline {SPAN} at (0,0) size 110x19
RenderText {#text} at (515,1) size 110x19
text run at (515,1) width 110: "Helvetica Bold"
RenderText {#text} at (625,2) size 10x19
text run at (625,2) width 10: " "
RenderText {#text} at (401,1) size 110x19
text run at (401,1) width 110: "Helvetica Bold"
RenderText {#text} at (511,2) size 10x19
text run at (511,2) width 10: " "
RenderInline {SPAN} at (0,0) size 110x19
RenderText {#text} at (635,1) size 110x19
text run at (635,1) width 110: "Helvetica Bold"
RenderText {#text} at (521,1) size 110x19
text run at (521,1) width 110: "Helvetica Bold"
RenderText {#text} at (631,2) size 10x19
text run at (631,2) width 10: " "
RenderInline {SPAN} at (0,0) size 110x19
RenderText {#text} at (641,1) size 110x19
text run at (641,1) width 110: "Helvetica Bold"
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 110x19
RenderText {#text} at (1,21) size 110x19
text run at (1,21) width 110: "Helvetica Bold"
RenderText {#text} at (0,0) size 0x0
RenderBlock {DIV} at (4,151) size 776x41 [border: (1px solid #ADD8E6)]
RenderBlock {DIV} at (4,152) size 776x41 [border: (1px solid #ADD8E6)]
RenderInline {SPAN} at (0,0) size 70x19
RenderText {#text} at (1,2) size 70x19
text run at (1,2) width 70: "Courier"
......@@ -133,58 +135,58 @@ layer at (0,0) size 800x600
text run at (321,2) width 70: "Courier"
RenderText {#text} at (391,2) size 10x19
text run at (391,2) width 10: " "
RenderInline {SPAN} at (0,0) size 104x19
RenderText {#text} at (401,1) size 104x19
text run at (401,1) width 104: "Helvetica Bold"
RenderText {#text} at (505,2) size 10x19
text run at (505,2) width 10: " "
RenderInline {SPAN} at (0,0) size 110x19
RenderText {#text} at (515,1) size 110x19
text run at (515,1) width 110: "Helvetica Bold"
RenderText {#text} at (625,2) size 10x19
text run at (625,2) width 10: " "
RenderText {#text} at (401,1) size 110x19
text run at (401,1) width 110: "Helvetica Bold"
RenderText {#text} at (511,2) size 10x19
text run at (511,2) width 10: " "
RenderInline {SPAN} at (0,0) size 110x19
RenderText {#text} at (521,1) size 110x19
text run at (521,1) width 110: "Helvetica Bold"
RenderText {#text} at (631,2) size 10x19
text run at (631,2) width 10: " "
RenderInline {SPAN} at (0,0) size 110x19
RenderText {#text} at (635,1) size 110x19
text run at (635,1) width 110: "Helvetica Bold"
RenderText {#text} at (641,1) size 110x19
text run at (641,1) width 110: "Helvetica Bold"
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 110x19
RenderText {#text} at (1,21) size 110x19
text run at (1,21) width 110: "Helvetica Bold"
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,208) size 784x19
RenderBlock {P} at (0,209) size 784x19
RenderText {#text} at (0,0) size 224x19
text run at (0,0) width 224: "Times followed by Ahem (normal):"
RenderBlock {DIV} at (4,243) size 776x21 [border: (1px solid #ADD8E6)]
RenderBlock {DIV} at (4,244) size 776x21 [border: (1px solid #ADD8E6)]
RenderText {#text} at (1,1) size 43x19
text run at (1,1) width 43: "Times "
RenderInline {I} at (0,0) size 64x17
RenderText {#text} at (44,3) size 64x17
text run at (44,3) width 64: "AHEM"
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,280) size 784x19
RenderBlock {P} at (0,281) size 784x19
RenderText {#text} at (0,0) size 101x19
text run at (0,0) width 101: "Ahem (normal):"
RenderBlock {DIV} at (4,315) size 776x19 [border: (1px solid #ADD8E6)]
RenderBlock {DIV} at (4,316) size 776x19 [border: (1px solid #ADD8E6)]
RenderText {#text} at (1,1) size 80x17
text run at (1,1) width 80: "AHEM "
RenderInline {I} at (0,0) size 64x17
RenderText {#text} at (81,1) size 64x17
text run at (81,1) width 64: "AHEM"
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,350) size 784x19
RenderBlock {P} at (0,351) size 784x19
RenderText {#text} at (0,0) size 326x19
text run at (0,0) width 326: "Ahem (normal) followed by Ahem (synthetic bold):"
RenderBlock {DIV} at (4,385) size 776x19 [border: (1px solid #ADD8E6)]
RenderBlock {DIV} at (4,386) size 776x19 [border: (1px solid #ADD8E6)]
RenderText {#text} at (1,1) size 80x17
text run at (1,1) width 80: "AHEM "
RenderInline {B} at (0,0) size 64x17
RenderText {#text} at (81,1) size 64x17
text run at (81,1) width 64: "AHEM"
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,420) size 784x19
RenderBlock {P} at (0,421) size 784x19
RenderText {#text} at (0,0) size 334x19
text run at (0,0) width 334: "Ahem (normal) followed by Ahem (synthetic italics):"
RenderBlock {DIV} at (4,455) size 776x19 [border: (1px solid #ADD8E6)]
RenderBlock {DIV} at (4,456) size 776x19 [border: (1px solid #ADD8E6)]
RenderText {#text} at (1,1) size 80x17
text run at (1,1) width 80: "AHEM "
RenderInline {I} at (0,0) size 64x17
......
7760b4fa8121e27ac036fd8d4badfc66
\ No newline at end of file
567ff3db6e3134ffd8b6a7d7fd0f2880
\ No newline at end of file
f56a2367b6a87f4d508829ab4528a61c
\ No newline at end of file
ef8b39ab2b6d373b2fdb0791cded0905
\ No newline at end of file
fontPath: /home/martin/WebKit-old/WebKitBuild/Release/../../Tools/DumpRenderTree/gtk/fonts/../../fonts/WebKitWeightWatcher100.ttf
fontPath: /home/martin/WebKit-old/WebKitBuild/Release/../../Tools/DumpRenderTree/gtk/fonts/../../fonts/WebKitWeightWatcher200.ttf
fontPath: /home/martin/WebKit-old/WebKitBuild/Release/../../Tools/DumpRenderTree/gtk/fonts/../../fonts/WebKitWeightWatcher300.ttf
fontPath: /home/martin/WebKit-old/WebKitBuild/Release/../../Tools/DumpRenderTree/gtk/fonts/../../fonts/WebKitWeightWatcher400.ttf
fontPath: /home/martin/WebKit-old/WebKitBuild/Release/../../Tools/DumpRenderTree/gtk/fonts/../../fonts/WebKitWeightWatcher500.ttf
fontPath: /home/martin/WebKit-old/WebKitBuild/Release/../../Tools/DumpRenderTree/gtk/fonts/../../fonts/WebKitWeightWatcher600.ttf
fontPath: /home/martin/WebKit-old/WebKitBuild/Release/../../Tools/DumpRenderTree/gtk/fonts/../../fonts/WebKitWeightWatcher700.ttf
fontPath: /home/martin/WebKit-old/WebKitBuild/Release/../../Tools/DumpRenderTree/gtk/fonts/../../fonts/WebKitWeightWatcher800.ttf
fontPath: /home/martin/WebKit-old/WebKitBuild/Release/../../Tools/DumpRenderTree/gtk/fonts/../../fonts/WebKitWeightWatcher900.ttf
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
......@@ -6,30 +15,30 @@ layer at (0,0) size 800x600
RenderBlock {P} at (0,0) size 784x19
RenderText {#text} at (0,0) size 266x19
text run at (0,0) width 266: "You should see the numbers 1 to 9 below."
RenderBlock {DIV} at (0,35) size 784x55
RenderText {#text} at (0,0) size 35x54
text run at (0,0) width 35: "A"
RenderBlock {DIV} at (0,90) size 784x55
RenderText {#text} at (0,0) size 35x54
text run at (0,0) width 35: "A"
RenderBlock {DIV} at (0,145) size 784x55
RenderText {#text} at (0,0) size 35x54
text run at (0,0) width 35: "A"
RenderBlock {DIV} at (0,200) size 784x55
RenderText {#text} at (0,0) size 35x54
text run at (0,0) width 35: "A"
RenderBlock {DIV} at (0,255) size 784x55
RenderText {#text} at (0,0) size 35x54
text run at (0,0) width 35: "A"
RenderBlock {DIV} at (0,310) size 784x55
RenderText {#text} at (0,0) size 35x54
text run at (0,0) width 35: "A"
RenderBlock {DIV} at (0,365) size 784x55
RenderText {#text} at (0,0) size 35x54
text run at (0,0) width 35: "A"
RenderBlock {DIV} at (0,420) size 784x55
RenderText {#text} at (0,0) size 35x54
text run at (0,0) width 35: "A"
RenderBlock {DIV} at (0,475) size 784x55
RenderText {#text} at (0,0) size 35x54
text run at (0,0) width 35: "A"
RenderBlock {DIV} at (0,35) size 784x48
RenderText {#text} at (0,2) size 24x44
text run at (0,2) width 24: "A"
RenderBlock {DIV} at (0,83) size 784x48
RenderText {#text} at (0,2) size 25x44
text run at (0,2) width 25: "A"
RenderBlock {DIV} at (0,131) size 784x48
RenderText {#text} at (0,2) size 26x44
text run at (0,2) width 26: "A"
RenderBlock {DIV} at (0,179) size 784x48
RenderText {#text} at (0,2) size 27x44
text run at (0,2) width 27: "A"
RenderBlock {DIV} at (0,227) size 784x48
RenderText {#text} at (0,2) size 29x44
text run at (0,2) width 29: "A"
RenderBlock {DIV} at (0,275) size 784x48
RenderText {#text} at (0,2) size 30x44
text run at (0,2) width 30: "A"
RenderBlock {DIV} at (0,323) size 784x48
RenderText {#text} at (0,2) size 31x44
text run at (0,2) width 31: "A"
RenderBlock {DIV} at (0,371) size 784x48
RenderText {#text} at (0,2) size 32x44
text run at (0,2) width 32: "A"
RenderBlock {DIV} at (0,419) size 784x48
RenderText {#text} at (0,2) size 33x44
text run at (0,2) width 33: "A"
52b48161dead612159dda3d2716bd765
\ No newline at end of file
e50b953e127d11ffb29797c82b026b59
\ No newline at end of file
c5e2b47412e5f8bd9d491052823d7ffa
\ No newline at end of file
3a57a0f676ca3e43c2680b5a200669f1
\ No newline at end of file
3d587f0eebb692d7ebcc2b34f56eb505
\ No newline at end of file
b9e5706a4d3d2bec1c00b7d6e134e4b2
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment