WebCore:

        Reviewed by Sam Weinig.

        - fix <rdar://problem/5158514> Switch the complex text code path to Core Text

        Tests: platform/mac-snowleopard/fast/text/myanmar-shaping.html
               platform/mac-snowleopard/fast/text/thai-combining-mark-positioning.html

        * config.h: Use Core Text if not building for Leopard or Tiger.

LayoutTests:

        Reviewed by Sam Weinig.

        - tests and updated results for <rdar://problem/5158514> Switch the complex text code path to Core Text

        * platform/mac-snowleopard/fast: Added.
        * platform/mac-snowleopard/fast/text: Added.
        * platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.checksum: Added.
        * platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.png: Added.
        * platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.txt: Added.
        * platform/mac-snowleopard/fast/text/myanmar-shaping-expected.checksum: Added.
        * platform/mac-snowleopard/fast/text/myanmar-shaping-expected.png: Added.
        * platform/mac-snowleopard/fast/text/myanmar-shaping-expected.txt: Added.
        * platform/mac-snowleopard/fast/text/myanmar-shaping.html: Added.
        * platform/mac-snowleopard/fast/text/resources: Added.
        * platform/mac-snowleopard/fast/text/resources/Garuda.ttf: Added from http://www.w3.org/International/tests/test-webfonts/test-thai-tibetan-myanmar.html.
        * platform/mac-snowleopard/fast/text/resources/mm3.ttf: Added from http://www.w3.org/International/tests/test-webfonts/test-thai-tibetan-myanmar.html.
        * platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.checksum: Added.
        * platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.png: Added.
        * platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.txt: Added.
        * platform/mac-snowleopard/fast/text/thai-combining-mark-positioning.html: Added.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c849b38729f3783f7b4e87a867676dc00880284a..db9fef9abe67b2592b3dba089f768a8ade875b82 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2008-09-22  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        - tests and updated results for <rdar://problem/5158514> Switch the complex text code path to Core Text
+
+        * platform/mac-snowleopard/fast: Added.
+        * platform/mac-snowleopard/fast/text: Added.
+        * platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.checksum: Added.
+        * platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.png: Added.
+        * platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.txt: Added.
+        * platform/mac-snowleopard/fast/text/myanmar-shaping-expected.checksum: Added.
+        * platform/mac-snowleopard/fast/text/myanmar-shaping-expected.png: Added.
+        * platform/mac-snowleopard/fast/text/myanmar-shaping-expected.txt: Added.
+        * platform/mac-snowleopard/fast/text/myanmar-shaping.html: Added.
+        * platform/mac-snowleopard/fast/text/resources: Added.
+        * platform/mac-snowleopard/fast/text/resources/Garuda.ttf: Added from http://www.w3.org/International/tests/test-webfonts/test-thai-tibetan-myanmar.html.
+        * platform/mac-snowleopard/fast/text/resources/mm3.ttf: Added from http://www.w3.org/International/tests/test-webfonts/test-thai-tibetan-myanmar.html.
+        * platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.checksum: Added.
+        * platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.png: Added.
+        * platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.txt: Added.
+        * platform/mac-snowleopard/fast/text/thai-combining-mark-positioning.html: Added.
+
 2008-09-22  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Darin Adler.

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.checksum b/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.checksum
new file mode 100644 (file)
index 0000000..8d5043f
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.checksum
@@ -0,0 +1 @@
+132297127dc92a2e5d165da61ff832d7
\ No newline at end of file

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.png b/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.png
new file mode 100644 (file)
index 0000000..444eb9c
Binary files /dev/null and b/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.png differ

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.txt b/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.txt
new file mode 100644 (file)
index 0000000..6d6031e
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.txt
@@ -0,0 +1,101 @@
+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 784x576
+      RenderBlock {P} at (0,0) size 784x36
+        RenderText {#text} at (0,0) size 104x18
+          text run at (0,0) width 104: "This is a test for "
+        RenderInline {I} at (0,0) size 757x36
+          RenderText {#text} at (104,0) size 757x36
+            text run at (104,0) width 653: "http://bugzilla.opendarwin.org/show_bug.cgi?id=6139 ATSUI code path should implement small caps,"
+            text run at (0,18) width 403: "synthetic bold and oblique and correct metrics for fallback fonts"
+        RenderText {#text} at (403,18) size 4x18
+          text run at (403,18) width 4: "."
+      RenderBlock {HR} at (0,52) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (0,70) size 784x18
+        RenderText {#text} at (0,0) size 600x18
+          text run at (0,0) width 600: "The two columns should be identical except for the accent over the e and the umlaut over the u."
+      RenderTable {TABLE} at (0,104) size 263x147 [border: none]
+        RenderTableSection {TBODY} at (0,0) size 262x146
+          RenderTableRow {TR} at (0,0) size 262x30
+            RenderTableCell {TD} at (0,0) size 131x30 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,3) size 69x25
+                text run at (2,3) width 69: "Lore\x{300}m "
+              RenderInline {SPAN} at (0,0) size 50x23
+                RenderText {#text} at (71,5) size 50x23
+                  text run at (71,5) width 50: "ipsu\x{308}m"
+              RenderText {#text} at (0,0) size 0x0
+            RenderTableCell {TD} at (131,0) size 131x30 [border: (1px solid #008000)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,3) size 69x25
+                text run at (2,3) width 69: "Lorem "
+              RenderInline {SPAN} at (0,0) size 50x23
+                RenderText {#text} at (71,5) size 50x23
+                  text run at (71,5) width 50: "ipsum"
+              RenderText {#text} at (0,0) size 0x0
+          RenderTableRow {TR} at (0,30) size 262x30
+            RenderTableCell {TD} at (0,30) size 131x30 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,3) size 75x25
+                text run at (2,3) width 75: "Lore\x{300}m "
+              RenderInline {SPAN} at (0,0) size 53x23
+                RenderText {#text} at (77,5) size 53x23
+                  text run at (77,5) width 53: "ipsu\x{308}m"
+              RenderText {#text} at (0,0) size 0x0
+            RenderTableCell {TD} at (131,30) size 131x30 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,3) size 75x25
+                text run at (2,3) width 75: "Lorem "
+              RenderInline {SPAN} at (0,0) size 53x23
+                RenderText {#text} at (77,5) size 53x23
+                  text run at (77,5) width 53: "ipsum"
+              RenderText {#text} at (0,0) size 0x0
+          RenderTableRow {TR} at (0,60) size 262x30
+            RenderTableCell {TD} at (0,60) size 131x30 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,3) size 69x25
+                text run at (2,3) width 69: "Lore\x{300}m "
+              RenderInline {SPAN} at (0,0) size 48x23
+                RenderText {#text} at (71,5) size 48x23
+                  text run at (71,5) width 48: "ipsu\x{308}m"
+              RenderText {#text} at (0,0) size 0x0
+            RenderTableCell {TD} at (131,60) size 131x30 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,3) size 69x25
+                text run at (2,3) width 69: "Lorem "
+              RenderInline {SPAN} at (0,0) size 48x23
+                RenderText {#text} at (71,5) size 48x23
+                  text run at (71,5) width 48: "ipsum"
+              RenderText {#text} at (0,0) size 0x0
+          RenderTableRow {TR} at (0,90) size 262x30
+            RenderTableCell {TD} at (0,90) size 131x30 [border: (1px solid #008000)] [r=3 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,3) size 75x25
+                text run at (2,3) width 75: "Lore\x{300}m "
+              RenderInline {SPAN} at (0,0) size 51x23
+                RenderText {#text} at (77,5) size 51x23
+                  text run at (77,5) width 51: "ipsu\x{308}m"
+              RenderText {#text} at (0,0) size 0x0
+            RenderTableCell {TD} at (131,90) size 131x30 [border: (1px solid #008000)] [r=3 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,3) size 75x25
+                text run at (2,3) width 75: "Lorem "
+              RenderInline {SPAN} at (0,0) size 51x23
+                RenderText {#text} at (77,5) size 51x23
+                  text run at (77,5) width 51: "ipsum"
+              RenderText {#text} at (0,0) size 0x0
+          RenderTableRow {TR} at (0,120) size 262x26
+            RenderTableCell {TD} at (0,120) size 131x26 [border: (1px solid #008000)] [r=4 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 100x23
+                text run at (2,2) width 100: "Lore\x{300}m ipsu\x{308}m"
+            RenderTableCell {TD} at (131,120) size 131x26 [border: (1px solid #008000)] [r=4 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 100x23
+                text run at (2,2) width 100: "Lorem ipsum"
+      RenderBlock {HR} at (0,259) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (0,277) size 784x18
+        RenderText {#text} at (0,0) size 277x18
+          text run at (0,0) width 277: "The following two lines should be identical."
+      RenderBlock {P} at (0,311) size 784x22
+        RenderInline {SPAN} at (0,0) size 334x24 [border: (1px solid #008000)]
+          RenderText {#text} at (1,0) size 332x22
+            text run at (1,0) width 332: "\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,349) size 784x21
+        RenderInline {SPAN} at (0,0) size 334x23 [border: (1px solid #008000)]
+          RenderText {#text} at (1,0) size 332x21
+            text run at (1,0) width 332: "\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}"
+        RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.checksum b/LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.checksum
new file mode 100644 (file)
index 0000000..3db8f1d
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.checksum
@@ -0,0 +1 @@
+5ac0c27753c2752e92509d66ba7e8879
\ No newline at end of file

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.png b/LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.png
new file mode 100644 (file)
index 0000000..9fbbddb
Binary files /dev/null and b/LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.png differ

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.txt b/LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.txt
new file mode 100644 (file)
index 0000000..5f2f3af
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.txt
@@ -0,0 +1,8 @@
+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 784x584
+      RenderBlock {DIV} at (0,0) size 784x71
+        RenderText {#text} at (0,1) size 574x69
+          text run at (0,1) width 574: "\x{1021}\x{1015}\x{103C}\x{100A}\x{103A}\x{1015}\x{103C}\x{100A}\x{103A}\x{1006}\x{102D}\x{102F}\x{1004}\x{103A}\x{101B}\x{102C}\x{101C}\x{103E}\x{102F}\x{1015}\x{103A}\x{101B}\x{103E}\x{102C}\x{1038}\x{1019}\x{103E}\x{102F}\x{104A}"

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping.html b/LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping.html
new file mode 100644 (file)
index 0000000..448afdf
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping.html
@@ -0,0 +1,14 @@
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <style>
+        @font-face {
+            font-family: myanmar3;
+            src: url(resources/mm3.ttf);
+        }
+    </style>
+</head>
+<body>
+    <div style="font-size: 54px; font-family: myanmar3;">
+        အပြည်ပြည်ဆိုင်ရာလှုပ်ရှားမှု၊
+    </div>
+</body>

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/resources/Garuda.ttf b/LayoutTests/platform/mac-snowleopard/fast/text/resources/Garuda.ttf
new file mode 100644 (file)
index 0000000..b9fcdfd
Binary files /dev/null and b/LayoutTests/platform/mac-snowleopard/fast/text/resources/Garuda.ttf differ

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/resources/mm3.ttf b/LayoutTests/platform/mac-snowleopard/fast/text/resources/mm3.ttf
new file mode 100644 (file)
index 0000000..f92a686
Binary files /dev/null and b/LayoutTests/platform/mac-snowleopard/fast/text/resources/mm3.ttf differ

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.checksum b/LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.checksum
new file mode 100644 (file)
index 0000000..f675651
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.checksum
@@ -0,0 +1 @@
+7ec53dc760aceddbd44e6362764e276b
\ No newline at end of file

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.png b/LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.png
new file mode 100644 (file)
index 0000000..7c94467
Binary files /dev/null and b/LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.png differ

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.txt b/LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.txt
new file mode 100644 (file)
index 0000000..a114f89
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.txt
@@ -0,0 +1,8 @@
+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 784x584
+      RenderBlock {DIV} at (0,0) size 784x101
+        RenderText {#text} at (0,0) size 385x101
+          text run at (0,0) width 385: "\x{E43}\x{E2B}\x{E49}\x{E21}\x{E35}\x{E02}\x{E36}\x{E49}\x{E19} \x{E01}\x{E32}\x{E23}\x{E17}\x{E4D}\x{E32}\x{E43}\x{E2B}\x{E49}"

diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning.html b/LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning.html
new file mode 100644 (file)
index 0000000..57523a4
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning.html
@@ -0,0 +1,14 @@
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <style>
+        @font-face {
+            font-family: garuda;
+            src: url(resources/Garuda.ttf);
+        }
+    </style>
+</head>
+<body>
+    <div style="font-size: 54px; font-family: garuda;">
+        ให้มีขึ้น การทําให้
+    </div>
+</body>

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 93e4eecfb935c0131363b6e220cee08070875588..a100f262c70d65dc91ce9706e7aa3587d0e858af 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2008-09-22  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        - fix <rdar://problem/5158514> Switch the complex text code path to Core Text
+
+        Tests: platform/mac-snowleopard/fast/text/myanmar-shaping.html
+               platform/mac-snowleopard/fast/text/thai-combining-mark-positioning.html
+
+        * config.h: Use Core Text if not building for Leopard or Tiger.
+
 2008-09-22  David Hyatt  <hyatt@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=21006

diff --git a/WebCore/config.h b/WebCore/config.h
index c35f055d3dfe9a6e516b779a5c087f5690594987..48222004b9fa298feaf492a4c1234b881cee8842 100644 (file)
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -105,9 +105,14 @@
 #endif
 
 #if PLATFORM(MAC)
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#define WTF_USE_ATSUI 0
+#define WTF_USE_CORE_TEXT 1
+#else
 #define WTF_USE_ATSUI 1
 #define WTF_USE_CORE_TEXT 0
 #endif
+#endif
 
 #if PLATFORM(SYMBIAN)
 #undef WIN32