Changeset 101537 in webkit

Timestamp:

Nov 30, 2011 11:30:08 AM (12 years ago)

Author:

timothy_horton@apple.com

Message:

dx causes non-BMP characters to fail to render
​https://bugs.webkit.org/show_bug.cgi?id=18039
<rdar://problem/10422142>

Reviewed by Simon Fraser.

Don't split the surrogate pairs of non-BMP characters across
elements of <text> positioning lists.

Test: svg/text/non-bmp-positioning-lists.svg

• rendering/svg/SVGTextLayoutAttributesBuilder.cpp:

(WebCore::SVGTextLayoutAttributesBuilder::propagateLayoutAttributes):

Add a test combining non-BMP characters and positioning lists.

• platform/mac/svg/text/non-bmp-positioning-lists-expected.png: Added.
• platform/mac/svg/text/non-bmp-positioning-lists-expected.txt: Added.
• svg/text/non-bmp-positioning-lists.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/text/non-bmp-positioning-lists-expected.png (added)
• LayoutTests/platform/mac/svg/text/non-bmp-positioning-lists-expected.txt (added)
• LayoutTests/svg/text/non-bmp-positioning-lists.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-30  Tim Horton  <timothy_horton@apple.com>
+
+        dx causes non-BMP characters to fail to render
+        https://bugs.webkit.org/show_bug.cgi?id=18039
+        <rdar://problem/10422142>
+
+        Reviewed by Simon Fraser.
+
+        Add a test combining non-BMP characters and positioning lists.
+
+        * platform/mac/svg/text/non-bmp-positioning-lists-expected.png: Added.
+        * platform/mac/svg/text/non-bmp-positioning-lists-expected.txt: Added.
+        * svg/text/non-bmp-positioning-lists.svg: Added.
+
 2011-11-30  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-30  Tim Horton  <timothy_horton@apple.com>
+
+        dx causes non-BMP characters to fail to render
+        https://bugs.webkit.org/show_bug.cgi?id=18039
+        <rdar://problem/10422142>
+
+        Reviewed by Simon Fraser.
+
+        Don't split the surrogate pairs of non-BMP characters across
+        elements of <text> positioning lists.
+
+        Test: svg/text/non-bmp-positioning-lists.svg
+
+        * rendering/svg/SVGTextLayoutAttributesBuilder.cpp:
+        (WebCore::SVGTextLayoutAttributesBuilder::propagateLayoutAttributes):
+
 2011-11-29  Robin Dunn  <robin@alldunn.com>
 

trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp

@@ -204 +204 @@
                 const UChar& currentCharacter = characters[textPosition];
 
-                SVGTextMetrics startToCurrentMetrics = SVGTextMetrics::measureCharacterRange(text, 0, textPosition + 1);
-                SVGTextMetrics currentMetrics = SVGTextMetrics::measureCharacterRange(text, textPosition, 1);
-                metricsLength = currentMetrics.length();
-
-                // Eventually handle surrogate pairs here.
-                if (!metricsLength) {
-                    if (textPosition + 1 == textLength)
-                        break;
-
+                SVGTextMetrics startToCurrentMetrics;
+                SVGTextMetrics currentMetrics;
+                unsigned valueListAdvance = 0;
+
+                if (U16_IS_LEAD(currentCharacter) && (textPosition + 1) < textLength && U16_IS_TRAIL(characters[textPosition + 1])) {
+                    // Handle surrogate pairs.
                     startToCurrentMetrics = SVGTextMetrics::measureCharacterRange(text, 0, textPosition + 2);
                     currentMetrics = SVGTextMetrics::measureCharacterRange(text, textPosition, 2);
                     metricsLength = currentMetrics.length();
+                    valueListAdvance = 1;
+                } else {
+                    // Handle BMP characters.
+                    startToCurrentMetrics = SVGTextMetrics::measureCharacterRange(text, 0, textPosition + 1);
+                    currentMetrics = SVGTextMetrics::measureCharacterRange(text, textPosition, 1);
+                    metricsLength = currentMetrics.length();
+                    valueListAdvance = metricsLength;
                 }
 
@@ -248 +252 @@
 
                 lastCharacter = currentCharacter;
-                valueListPosition += metricsLength;
+                valueListPosition += valueListAdvance;
             }