From 32d65d71564648670ce6f67d9cbd5c6427d4e082 Mon Sep 17 00:00:00 2001
From: "mitz@apple.com" <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon, 2 Jul 2012 00:08:47 +0000
Subject: [PATCH] <rdar://problem/11785743> [mac] Non-BMP characters in
 vertical text appear as missing glyphs
 https://bugs.webkit.org/show_bug.cgi?id=90349
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Reviewed by Dean Jackson.

Source/WebCore:

Test: platform/mac/fast/text/vertical-surrogate-pair.html

* platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
(WebCore::GlyphPage::fill): When calling wkGetVerticalGlyphsForCharacters or
CTFontGetGlyphsForCharacters with a buffer consisting of surrogate pair, account for those
functions’ behavior of placing glyphs at indices corresponding to the first character of
each pair.

LayoutTests:

* platform/mac/fast/text/vertical-surrogate-pair.html: Added.
* platform/mac/platform/mac/fast/text/vertical-surrogate-pair-expected.png: Added.
* platform/mac/platform/mac/fast/text/vertical-surrogate-pair-expected.txt: Added.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121645 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 LayoutTests/ChangeLog                                    |  11 +++++++++++
 .../platform/mac/fast/text/vertical-surrogate-pair.html  |   8 ++++++++
 .../mac/fast/text/vertical-surrogate-pair-expected.png   | Bin 0 -> 9837 bytes
 .../mac/fast/text/vertical-surrogate-pair-expected.txt   |  14 ++++++++++++++
 Source/WebCore/ChangeLog                                 |  15 +++++++++++++++
 .../platform/graphics/mac/GlyphPageTreeNodeMac.cpp       |   7 +++++--
 6 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 LayoutTests/platform/mac/fast/text/vertical-surrogate-pair.html
 create mode 100644 LayoutTests/platform/mac/platform/mac/fast/text/vertical-surrogate-pair-expected.png
 create mode 100644 LayoutTests/platform/mac/platform/mac/fast/text/vertical-surrogate-pair-expected.txt

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c393376..791a27e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2012-07-01  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/11785743> [mac] Non-BMP characters in vertical text appear as missing glyphs
+        https://bugs.webkit.org/show_bug.cgi?id=90349
+
+        Reviewed by Dean Jackson.
+
+        * platform/mac/fast/text/vertical-surrogate-pair.html: Added.
+        * platform/mac/platform/mac/fast/text/vertical-surrogate-pair-expected.png: Added.
+        * platform/mac/platform/mac/fast/text/vertical-surrogate-pair-expected.txt: Added.
+
 2012-07-01  Kenichi Ishibashi  <bashi@chromium.org>
 
         Arabic shaping is incorrect if ZWNJ exist
diff --git a/LayoutTests/platform/mac/fast/text/vertical-surrogate-pair.html b/LayoutTests/platform/mac/fast/text/vertical-surrogate-pair.html
new file mode 100644
index 0000000..814992f
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/text/vertical-surrogate-pair.html
@@ -0,0 +1,8 @@
+<style>
+    div { font-family: 'hiragino mincho pro'; font-size: 48px; }
+</style>
+<p>
+    These two glyphs should look the same:
+</p>
+<div>&#x20b9f;</div>
+<div style="-webkit-writing-mode: vertical-lr;">&#x20b9f;</div>
diff --git a/LayoutTests/platform/mac/platform/mac/fast/text/vertical-surrogate-pair-expected.png b/LayoutTests/platform/mac/platform/mac/fast/text/vertical-surrogate-pair-expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3460584636b35f433e496439598c3569424812e
GIT binary patch
literal 9837
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
B5bXc}

literal 0
HcmV?d00001

diff --git a/LayoutTests/platform/mac/platform/mac/fast/text/vertical-surrogate-pair-expected.txt b/LayoutTests/platform/mac/platform/mac/fast/text/vertical-surrogate-pair-expected.txt
new file mode 100644
index 0000000..48ec2e3
--- /dev/null
+++ b/LayoutTests/platform/mac/platform/mac/fast/text/vertical-surrogate-pair-expected.txt
@@ -0,0 +1,14 @@
+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 {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 253x18
+          text run at (0,0) width 253: "These two glyphs should look the same:"
+      RenderBlock {DIV} at (0,34) size 784x72
+        RenderText {#text} at (0,12) size 48x48
+          text run at (0,12) width 48: "\x{D842}\x{DF9F}"
+      RenderBlock {DIV} at (0,106) size 72x49
+        RenderText {#text} at (12,0) size 48x49
+          text run at (12,0) width 49: "\x{D842}\x{DF9F}"
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 443d101..439d05a 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2012-07-01  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/11785743> [mac] Non-BMP characters in vertical text appear as missing glyphs
+        https://bugs.webkit.org/show_bug.cgi?id=90349
+
+        Reviewed by Dean Jackson.
+
+        Test: platform/mac/fast/text/vertical-surrogate-pair.html
+
+        * platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
+        (WebCore::GlyphPage::fill): When calling wkGetVerticalGlyphsForCharacters or
+        CTFontGetGlyphsForCharacters with a buffer consisting of surrogate pair, account for those
+        functions’ behavior of placing glyphs at indices corresponding to the first character of
+        each pair.
+
 2012-07-01  Kenichi Ishibashi  <bashi@chromium.org>
 
         Arabic shaping is incorrect if ZWNJ exist
diff --git a/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp b/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
index 98a53f9..45a6691 100644
--- a/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
+++ b/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
@@ -68,11 +68,14 @@ bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned b
         }
     } else if (!fontData->platformData().isCompositeFontReference() && ((fontData->platformData().widthVariant() == RegularWidth) ? wkGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)
                : CTFontGetGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength))) {
+        // When buffer consists of surrogate pairs, wkGetVerticalGlyphsForCharacters and CTFontGetGlyphsForCharacters
+        // place the glyphs at indices corresponding to the first character of each pair.
+        unsigned glyphStep = bufferLength / length;
         for (unsigned i = 0; i < length; ++i) {
-            if (!glyphs[i])
+            if (!glyphs[i * glyphStep])
                 setGlyphDataForIndex(offset + i, 0, 0);
             else {
-                setGlyphDataForIndex(offset + i, glyphs[i], fontData);
+                setGlyphDataForIndex(offset + i, glyphs[i * glyphStep], fontData);
                 haveGlyphs = true;
             }
         }
-- 
2.7.4