Changeset 66740 in webkit

Timestamp:

Sep 3, 2010 10:56:36 AM (14 years ago)

Author:

mitz@apple.com

Message:

2010-09-03 Dan Bernstein <​mitz@apple.com>

Reviewed by Anders Carlsson.

<rdar://problem/8392655> REGRESSION (r57215): Decomposed diacritics render incorrectly when preceded by stacked diacritics
​https://bugs.webkit.org/show_bug.cgi?id=45182

Test: fast/text/decomposed-after-stacked-diacritics.html

• platform/graphics/Font.cpp: (WebCore::Font::codePath): Do not bail out if the run contains stacked diacritics, since it may also contain characters that require the complex text code path.

2010-09-03 Dan Bernstein <​mitz@apple.com>

Reviewed by Anders Carlsson.

<rdar://problem/8392655> REGRESSION (r57215): Decomposed diacritics render incorrectly when preceded by stacked diacritics
​https://bugs.webkit.org/show_bug.cgi?id=45182

• fast/text/decomposed-after-stacked-diacritics-expected.txt: Added.
• fast/text/decomposed-after-stacked-diacritics.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/decomposed-after-stacked-diacritics-expected.txt (added)
• LayoutTests/fast/text/decomposed-after-stacked-diacritics.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/Font.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-03  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/8392655> REGRESSION (r57215): Decomposed diacritics render incorrectly when preceded by stacked diacritics
+        https://bugs.webkit.org/show_bug.cgi?id=45182
+
+        * fast/text/decomposed-after-stacked-diacritics-expected.txt: Added.
+        * fast/text/decomposed-after-stacked-diacritics.html: Added.
+
 2010-09-03  Mihai Parparita  <mihaip@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-03  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/8392655> REGRESSION (r57215): Decomposed diacritics render incorrectly when preceded by stacked diacritics
+        https://bugs.webkit.org/show_bug.cgi?id=45182
+
+        Test: fast/text/decomposed-after-stacked-diacritics.html
+
+        * platform/graphics/Font.cpp:
+        (WebCore::Font::codePath): Do not bail out if the run contains stacked diacritics, since
+        it may also contain characters that require the complex text code path.
+
 2010-09-03  Mikhail Naganov  <mnaganov@chromium.org>
 

trunk/WebCore/platform/graphics/Font.cpp

@@ -278 +278 @@
 #endif
 
+    CodePath result = Simple;
+
     // Start from 0 since drawing and highlighting also measure the characters before run->from
     for (int i = 0; i < run.length(); i++) {
@@ -313 +315 @@
         if (c < 0x1E00) // U+1E00 through U+2000 characters with diacritics and stacked diacritics
             continue;
-        if (c <= 0x2000)
-            return SimpleWithGlyphOverflow;
+        if (c <= 0x2000) {
+            result = SimpleWithGlyphOverflow;
+            continue;
+        }
 
         if (c < 0x20D0) // U+20D0 through U+20FF Combining marks for symbols
@@ -330 +334 @@
         return Complex;
 
-    return Simple;
-}
-
-}
+    return result;
+}
+
+}