<rdar://problem/9180716> REGRESSION (r80582): Angle bracket rendered upright in verti...
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 27 Mar 2011 01:38:47 +0000 (01:38 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 27 Mar 2011 01:38:47 +0000 (01:38 +0000)
https://bugs.webkit.org/show_bug.cgi?id=57169

Reviewed by Maciej Stachowiak.

Source/WebCore:

Test: fast/blockflow/fallback-orientation.html

* platform/graphics/FontFastPath.cpp:
(WebCore::Font::glyphDataForCharacter): If the font has vertical glyphs, use it, rather
than continuing down the fallback list.

LayoutTests:

* fast/blockflow/fallback-orientation.html: Added.
* platform/mac/fast/blockflow/fallback-orientation-expected.checksum: Added.
* platform/mac/fast/blockflow/fallback-orientation-expected.png: Added.
* platform/mac/fast/blockflow/fallback-orientation-expected.txt: Added.

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

LayoutTests/ChangeLog
LayoutTests/fast/blockflow/fallback-orientation.html [new file with mode: 0644]
LayoutTests/platform/mac/fast/blockflow/fallback-orientation-expected.checksum [new file with mode: 0644]
LayoutTests/platform/mac/fast/blockflow/fallback-orientation-expected.png [new file with mode: 0644]
LayoutTests/platform/mac/fast/blockflow/fallback-orientation-expected.txt [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/FontFastPath.cpp

index 22df1656559df3ed1565ad7d24aae0d2180a15de..97eb538c7fbf7953ce68b088c5659262948c07fb 100644 (file)
@@ -1,3 +1,15 @@
+2011-03-26  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/9180716> REGRESSION (r80582): Angle bracket rendered upright in vertical mode
+        https://bugs.webkit.org/show_bug.cgi?id=57169
+
+        * fast/blockflow/fallback-orientation.html: Added.
+        * platform/mac/fast/blockflow/fallback-orientation-expected.checksum: Added.
+        * platform/mac/fast/blockflow/fallback-orientation-expected.png: Added.
+        * platform/mac/fast/blockflow/fallback-orientation-expected.txt: Added.
+
 2011-03-26  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/blockflow/fallback-orientation.html b/LayoutTests/fast/blockflow/fallback-orientation.html
new file mode 100644 (file)
index 0000000..9e7b8ec
--- /dev/null
@@ -0,0 +1,7 @@
+<p>
+    This should be pointing upwards:
+</p>
+<div style="font-family: 'hiragino mincho pro'; font-size: 80px; -webkit-writing-mode: vertical-rl;">
+    &#x3008;
+</div>
+</html>
diff --git a/LayoutTests/platform/mac/fast/blockflow/fallback-orientation-expected.checksum b/LayoutTests/platform/mac/fast/blockflow/fallback-orientation-expected.checksum
new file mode 100644 (file)
index 0000000..b82952c
--- /dev/null
@@ -0,0 +1 @@
+7240cc2ea9f191173261de9bcdf00124
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/blockflow/fallback-orientation-expected.png b/LayoutTests/platform/mac/fast/blockflow/fallback-orientation-expected.png
new file mode 100644 (file)
index 0000000..2886855
Binary files /dev/null and b/LayoutTests/platform/mac/fast/blockflow/fallback-orientation-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/blockflow/fallback-orientation-expected.txt b/LayoutTests/platform/mac/fast/blockflow/fallback-orientation-expected.txt
new file mode 100644 (file)
index 0000000..9ed3069
--- /dev/null
@@ -0,0 +1,11 @@
+layer at (0,0) size 785x650
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x650
+  RenderBlock {HTML} at (0,0) size 785x650
+    RenderBody {BODY} at (8,8) size 769x634
+      RenderBlock {P} at (0,0) size 769x18
+        RenderText {#text} at (0,0) size 211x18
+          text run at (0,0) width 211: "This should be pointing upwards:"
+      RenderBlock {DIV} at (0,34) size 120x600
+        RenderText {#text} at (20,0) size 80x81
+          text run at (20,0) width 81: "\x{3008}"
index dea20941c32110d8bbd3a1a1a3dfeeffe6389f1c..05ef6105eb0eef67a052a438d992b73da09a7ccc 100644 (file)
@@ -1,3 +1,16 @@
+2011-03-26  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/9180716> REGRESSION (r80582): Angle bracket rendered upright in vertical mode
+        https://bugs.webkit.org/show_bug.cgi?id=57169
+
+        Test: fast/blockflow/fallback-orientation.html
+
+        * platform/graphics/FontFastPath.cpp:
+        (WebCore::Font::glyphDataForCharacter): If the font has vertical glyphs, use it, rather
+        than continuing down the fallback list.
+
 2011-03-26  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin Adler.
index 622d08b88a1f11cb77b5b34a43fd94dd81332483..b741ca032ea937721b1b8cfd4d1a060fca1c8874 100644 (file)
@@ -96,7 +96,6 @@ GlyphData Font::glyphDataForCharacter(UChar32 c, bool mirror, FontDataVariant va
                             
                             // Shouldn't be possible to even reach this point.
                             ASSERT_NOT_REACHED();
-                            return data;
                         }
                     } else {
                         if (m_fontDescription.textOrientation() == TextOrientationVerticalRight) {
@@ -131,8 +130,8 @@ GlyphData Font::glyphDataForCharacter(UChar32 c, bool mirror, FontDataVariant va
 
                         // Shouldn't be possible to even reach this point.
                         ASSERT_NOT_REACHED();
-                        return data;
                     }
+                    return data;
                 }
 
                 if (node->isSystemFallback())