summaryrefslogtreecommitdiffstats
path: root/webkit/data
diff options
context:
space:
mode:
authordglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-29 22:11:23 +0000
committerdglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-29 22:11:23 +0000
commit0e9120dd886ca8ed40261250ed5c1cb9dcf502e3 (patch)
treef92d91de9d753c4424ce64f2b59898d3de68321d /webkit/data
parent949ad3315c2e93cc3d8d21e9726187ec7c0f253e (diff)
downloadchromium_src-0e9120dd886ca8ed40261250ed5c1cb9dcf502e3.zip
chromium_src-0e9120dd886ca8ed40261250ed5c1cb9dcf502e3.tar.gz
chromium_src-0e9120dd886ca8ed40261250ed5c1cb9dcf502e3.tar.bz2
Makes sure that debug-only layout test failures are not to the ZERO WIDTH SPACE mapping to SPACE glyph complaints (http://b/1317563), fixes a layout test (fast/text/zero-width-characters.html), and provides an updated patch for WebKit.org bug 20237 (https://bugs.webkit.org/show_bug.cgi?id=20237).
This change brings handling of the ZWS and CJK character widths down to the level of SimpleFontData by creating special (sub-classed) SimpleFontData objects that are used in GlyphData. These instances are created when the glyph cache is being filled (GlyphPage::fill). More better things are possible, but at the moment I thought it might be good to just get the basics right. Also, a couple of the layout tests are brought back to pre-font-metric-hacks removal versions. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
-rw-r--r--webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/continuation-after-outline-expected.txt4
-rw-r--r--webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.checksum2
-rw-r--r--webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.pngbin4486 -> 4489 bytes
-rw-r--r--webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.txt4
4 files changed, 5 insertions, 5 deletions
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/continuation-after-outline-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/continuation-after-outline-expected.txt
index b6ac7ce..74aa009 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/continuation-after-outline-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/continuation-after-outline-expected.txt
@@ -14,7 +14,7 @@ layer at (0,0) size 800x96
text run at (21,0) width 7: "x"
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,60) size 784x20
- RenderText {#text} at (0,0) size 4x19
- text run at (0,0) width 4: "\x{19}"
+ RenderText {#text} at (0,0) size 0x19
+ text run at (0,0) width 0: "\x{19}"
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.checksum b/webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.checksum
index d0e83b2..08b93d0 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.checksum
+++ b/webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.checksum
@@ -1 +1 @@
-844d5b7ea45d2c834778fd16f56fd5e1 \ No newline at end of file
+341ad6b6a7d2d9f1d13a56fec8b17743 \ No newline at end of file
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.png b/webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.png
index dfe8727..da3fc637 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.png
+++ b/webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.png
Binary files differ
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.txt
index 1aef145..40f1195 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.txt
@@ -3,5 +3,5 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderText {#text} at (0,0) size 664x19
- text run at (0,0) width 664: "GIF89a\x{D4}\x{1}<\x{20AC}\x{7F}!\x{FF}\x{B}NETSCAPE2.0\x{3}\x{1}!\x{F9}\x{4}\x{4}<,\x{D4}\x{1}<\x{201A}\x{7F}\x{FF}\x{FF}\x{FF}\x{FF}\x{FF}\x{DF}\x{DF}\x{DF}\x{BF}\x{BF}\x{BF}\x{7F}\x{7F}\x{7F}\x{3}\x{FF}8\x{BA}\x{DC}\x{FE}0\x{CA}I\x{AB}\x{BD}8\x{EB}\x{CD}\x{BB}\x{FF}`(\x{17D}di*\x{C6} \x{AC}l\x{EB}\x{BE}p,\x{CF}tm\x{DF}x\x{AE}\x{EF}|\x{EF}\x{FF}\x{C0} pH,"
+ RenderText {#text} at (0,0) size 632x19
+ text run at (0,0) width 632: "GIF89a\x{D4}\x{1}<\x{20AC}\x{7F}!\x{FF}\x{B}NETSCAPE2.0\x{3}\x{1}!\x{F9}\x{4}\x{4}<,\x{D4}\x{1}<\x{201A}\x{7F}\x{FF}\x{FF}\x{FF}\x{FF}\x{FF}\x{DF}\x{DF}\x{DF}\x{BF}\x{BF}\x{BF}\x{7F}\x{7F}\x{7F}\x{3}\x{FF}8\x{BA}\x{DC}\x{FE}0\x{CA}I\x{AB}\x{BD}8\x{EB}\x{CD}\x{BB}\x{FF}`(\x{17D}di*\x{C6} \x{AC}l\x{EB}\x{BE}p,\x{CF}tm\x{DF}x\x{AE}\x{EF}|\x{EF}\x{FF}\x{C0} pH,"