[webkit-changes] [165131] branches/safari-537.75-branch

Wed, 05 Mar 2014 14:27:49 -0800

Title: [165131] branches/safari-537.75-branch

Diff

Modified: branches/safari-537.75-branch/LayoutTests/ChangeLog (165130 => 165131)


--- branches/safari-537.75-branch/LayoutTests/ChangeLog	2014-03-05 22:02:55 UTC (rev 165130)
+++ branches/safari-537.75-branch/LayoutTests/ChangeLog	2014-03-05 22:31:34 UTC (rev 165131)
@@ -1,5 +1,24 @@
 2014-03-05  Matthew Hanson  <[email protected]>
 
+        Merge r158697.
+
+    2013-11-05  Enrica Casucci  <[email protected]>
+
+            Full width semicolon is wrong in vertical text.
+            https://bugs.webkit.org/show_bug.cgi?id=123814
+            <rdar://problem/15312541>
+
+            Reviewed by Benjamin Poulain.
+
+            Extended the existing test to include the full width
+            semicolon.
+
+            * platform/mac/fast/text/vertical-no-sideways.html:
+            * platform/mac/platform/mac/fast/text/vertical-no-sideways-expected.txt:
+            * platform/mac-mountainlion/platform/mac/fast/text/vertical-no-sideways-expected.txt
+
+2014-03-05  Matthew Hanson  <[email protected]>
+
         Merge r163465.
 
     2014-02-04  Myles C. Maxfield  <[email protected]>

Modified: branches/safari-537.75-branch/LayoutTests/platform/mac/fast/text/vertical-no-sideways.html (165130 => 165131)


--- branches/safari-537.75-branch/LayoutTests/platform/mac/fast/text/vertical-no-sideways.html	2014-03-05 22:02:55 UTC (rev 165130)
+++ branches/safari-537.75-branch/LayoutTests/platform/mac/fast/text/vertical-no-sideways.html	2014-03-05 22:31:34 UTC (rev 165131)
@@ -1,5 +1,5 @@
 <div style="font-family: 'Lucida grande'; font-size: 24px; border: solid red 1px; letter-spacing: 15px;">
-    &#x000A7;&#x000A9;&#x000AE;&#x000B6;&#x000BC;&#x000BD;&#x000BE;<br>
+    &#x000A7;&#x000A9;&#x000AE;&#x0FF1B;&#x000B6;&#x000BC;&#x000BD;&#x000BE;<br>
     &#x002E5;&#x002E6;&#x002E7;&#x002E8;&#x002E9;&#x002EA;&#x002EB;<br>
     &#x01100;&#x01101;&#x01401;&#x01402;&#x01800;&#x01801;<br>
     &#x02016;&#x02018;&#x02019;&#x02020;&#x02021;&#x02030;&#x02031;<br>
@@ -15,7 +15,7 @@
     &#x0FF40;&#x0FF5A;&#x0FFE0;&#x0FFE2;&#x0FFE4;&#x0FFFD;&#x1D300;&#x1F64F;&#x1F680;<br>
 </div>
 <div style="font-family: 'Lucida grande'; font-size: 24px; border: solid blue 1px; -webkit-writing-mode: vertical-lr; -webkit-column-progression: normal; letter-spacing: 15px;">
-    &#x000A7;&#x000A9;&#x000AE;&#x000B6;&#x000BC;&#x000BD;&#x000BE;<br>
+    &#x000A7;&#x000A9;&#x000AE;&#x0FF1B;&#x000B6;&#x000BC;&#x000BD;&#x000BE;<br>
     &#x002E5;&#x002E6;&#x002E7;&#x002E8;&#x002E9;&#x002EA;&#x002EB;<br>
     &#x01100;&#x01101;&#x01401;&#x01402;&#x01800;&#x01801;<br>
     &#x02016;&#x02018;&#x02019;&#x02020;&#x02021;&#x02030;&#x02031;<br>

Modified: branches/safari-537.75-branch/LayoutTests/platform/mac/platform/mac/fast/text/vertical-no-sideways-expected.txt (165130 => 165131)


--- branches/safari-537.75-branch/LayoutTests/platform/mac/platform/mac/fast/text/vertical-no-sideways-expected.txt	2014-03-05 22:02:55 UTC (rev 165130)
+++ branches/safari-537.75-branch/LayoutTests/platform/mac/platform/mac/fast/text/vertical-no-sideways-expected.txt	2014-03-05 22:31:34 UTC (rev 165131)
@@ -1,87 +1,87 @@
-layer at (0,0) size 785x953
+layer at (0,0) size 785x961
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x953
-  RenderBlock {HTML} at (0,0) size 785x953
-    RenderBody {BODY} at (8,8) size 769x937
-      RenderBlock {DIV} at (0,0) size 769x442 [border: (1px solid #FF0000)]
-        RenderText {#text} at (1,1) size 235x28
-          text run at (1,1) width 235: "\x{A7}\x{A9}\x{AE}\x{B6}\x{BC}\x{BD}\x{BE}"
-        RenderBR {BR} at (235,24) size 1x0
-        RenderText {#text} at (1,29) size 170x28
-          text run at (1,29) width 170: "\x{2E5}\x{2E6}\x{2E7}\x{2E8}\x{2E9}\x{2EA}\x{2EB}"
-        RenderBR {BR} at (170,52) size 1x0
-        RenderText {#text} at (1,60) size 187x28
-          text run at (1,60) width 187: "\x{1100}\x{1101}\x{1401}\x{1402}\x{1800}\x{1801}"
-        RenderBR {BR} at (188,83) size 0x0
-        RenderText {#text} at (1,90) size 222x28
-          text run at (1,90) width 222: "\x{2016}\x{2018}\x{2019}\x{2020}\x{2021}\x{2030}\x{2031}"
-        RenderBR {BR} at (222,113) size 1x0
-        RenderText {#text} at (1,118) size 247x28
-          text run at (1,118) width 247: "\x{203B}\x{203C}\x{203D}\x{2042}\x{2044}\x{2047}\x{2048}\x{2049}\x{2051}"
-        RenderBR {BR} at (247,141) size 1x0
-        RenderText {#text} at (1,150) size 392x28
-          text run at (1,150) width 392: "\x{2100}\x{2101}\x{2116}\x{2117}\x{2119}\x{211A}\x{2130}\x{2131}\x{2133}\x{2134}\x{213E}\x{213F}"
-        RenderBR {BR} at (392,173) size 1x0
-        RenderText {#text} at (1,188) size 150x28
-          text run at (1,188) width 150: "\x{2145}\x{2146}\x{2149}\x{214A}\x{214D}"
-        RenderBR {BR} at (151,211) size 0x0
-        RenderText {#text} at (1,226) size 568x28
-          text run at (1,226) width 282: "\x{2300}\x{2307}\x{230C}\x{231F}\x{2322}\x{232B}\x{237D}\x{239A} "
-          text run at (282,226) width 287: "\x{23B4}\x{23B6}\x{23BA}\x{23CF}\x{23D1}\x{23DB}\x{23E2}\x{24FF}"
-        RenderBR {BR} at (568,249) size 1x0
-        RenderText {#text} at (1,263) size 319x28
-          text run at (1,263) width 319: "\x{25A0}\x{2619}\x{2620}\x{2767}\x{2776}\x{2793}\x{2B12}\x{2B2F}\x{2E80}\x{2007}"
-        RenderBR {BR} at (319,286) size 1x0
-        RenderText {#text} at (1,301) size 327x28
-          text run at (1,301) width 327: "\x{3012}\x{3013}\x{3020}\x{302F}\x{3031}\x{309F}\x{30A1}\x{30FB}\x{30FD}"
-        RenderBR {BR} at (328,324) size 0x0
-        RenderText {#text} at (1,337) size 312x28
-          text run at (1,337) width 312: "\x{FE10}\x{FE30}\x{FE48}\x{FE50}\x{FE57}\x{FE5F}\x{FE62}\x{FE6}"
-        RenderBR {BR} at (313,360) size 0x0
-        RenderText {#text} at (1,373) size 390x28
-          text run at (1,373) width 390: "\x{FF01}\x{FF07}\x{FF0A}\x{FF0C}\x{FF0E}\x{FF19}\x{FF1F}\x{FF3A}\x{FF3C}\x{FF3E}"
-        RenderBR {BR} at (391,396) size 0x0
-        RenderText {#text} at (1,409) size 349x28
-          text run at (1,409) width 349: "\x{FF40}\x{FF5A}\x{FFE0}\x{FFE2}\x{FFE4}\x{FFFD}\x{D834}\x{DF00}\x{D83D}\x{DE4F}\x{D83D}\x{DE80}"
-        RenderBR {BR} at (349,432) size 1x0
-      RenderBlock {DIV} at (0,442) size 438x495 [border: (1px solid #0000FF)]
-        RenderText {#text} at (1,1) size 28x256
-          text run at (1,1) width 256: "\x{A7}\x{A9}\x{AE}\x{B6}\x{BC}\x{BD}\x{BE}"
-        RenderBR {BR} at (6,256) size 0x1
-        RenderText {#text} at (29,1) size 28x219
-          text run at (29,1) width 219: "\x{2E5}\x{2E6}\x{2E7}\x{2E8}\x{2E9}\x{2EA}\x{2EB}"
-        RenderBR {BR} at (34,219) size 0x1
-        RenderText {#text} at (59,1) size 28x197
-          text run at (59,1) width 197: "\x{1100}\x{1101}\x{1401}\x{1402}\x{1800}\x{1801}"
-        RenderBR {BR} at (73,198) size 0x0
-        RenderText {#text} at (89,1) size 28x223
-          text run at (89,1) width 223: "\x{2016}\x{2018}\x{2019}\x{2020}\x{2021}\x{2030}\x{2031}"
-        RenderBR {BR} at (94,223) size 0x1
-        RenderText {#text} at (117,1) size 28x293
-          text run at (117,1) width 293: "\x{203B}\x{203C}\x{203D}\x{2042}\x{2044}\x{2047}\x{2048}\x{2049}\x{2051}"
-        RenderBR {BR} at (122,293) size 0x1
-        RenderText {#text} at (149,1) size 28x403
-          text run at (149,1) width 403: "\x{2100}\x{2101}\x{2116}\x{2117}\x{2119}\x{211A}\x{2130}\x{2131}\x{2133}\x{2134}\x{213E}\x{213F}"
-        RenderBR {BR} at (154,403) size 0x1
-        RenderText {#text} at (187,1) size 28x170
-          text run at (187,1) width 170: "\x{2145}\x{2146}\x{2149}\x{214A}\x{214D}"
-        RenderBR {BR} at (192,170) size 0x1
-        RenderText {#text} at (225,1) size 28x493
-          text run at (225,1) width 262: "\x{2300}\x{2307}\x{230C}\x{231F}\x{2322}\x{232B}\x{237D}\x{239A} "
-          text run at (225,262) width 231: "\x{23B4}\x{23B6}\x{23BA}\x{23CF}\x{23D1}\x{23DB}\x{23E2}\x{24FF}"
-        RenderBR {BR} at (239,493) size 0x1
-        RenderText {#text} at (261,1) size 28x320
-          text run at (261,1) width 320: "\x{25A0}\x{2619}\x{2620}\x{2767}\x{2776}\x{2793}\x{2B12}\x{2B2F}\x{2E80}\x{2007}"
-        RenderBR {BR} at (275,320) size 0x1
-        RenderText {#text} at (297,1) size 28x350
-          text run at (297,1) width 350: "\x{3012}\x{3013}\x{3020}\x{302F}\x{3031}\x{309F}\x{30A1}\x{30FB}\x{30FD}"
-        RenderBR {BR} at (311,351) size 0x0
-        RenderText {#text} at (333,1) size 28x312
-          text run at (333,1) width 312: "\x{FE10}\x{FE30}\x{FE48}\x{FE50}\x{FE57}\x{FE5F}\x{FE62}\x{FE6}"
-        RenderBR {BR} at (347,313) size 0x0
-        RenderText {#text} at (369,1) size 28x390
-          text run at (369,1) width 390: "\x{FF01}\x{FF07}\x{FF0A}\x{FF0C}\x{FF0E}\x{FF19}\x{FF1F}\x{FF3A}\x{FF3C}\x{FF3E}"
-        RenderBR {BR} at (383,391) size 0x0
-        RenderText {#text} at (405,1) size 28x334
-          text run at (405,1) width 334: "\x{FF40}\x{FF5A}\x{FFE0}\x{FFE2}\x{FFE4}\x{FFFD}\x{D834}\x{DF00}\x{D83D}\x{DE4F}\x{D83D}\x{DE80}"
-        RenderBR {BR} at (419,334) size 0x1
+layer at (0,0) size 785x961
+  RenderBlock {HTML} at (0,0) size 785x961
+    RenderBody {BODY} at (8,8) size 769x945
+      RenderBlock {DIV} at (0,0) size 769x450 [border: (1px solid #FF0000)]
+        RenderText {#text} at (1,5) size 274x28
+          text run at (1,5) width 274: "\x{A7}\x{A9}\x{AE}\x{FF1B}\x{B6}\x{BC}\x{BD}\x{BE}"
+        RenderBR {BR} at (274,28) size 1x0
+        RenderText {#text} at (1,37) size 170x28
+          text run at (1,37) width 170: "\x{2E5}\x{2E6}\x{2E7}\x{2E8}\x{2E9}\x{2EA}\x{2EB}"
+        RenderBR {BR} at (170,60) size 1x0
+        RenderText {#text} at (1,68) size 187x28
+          text run at (1,68) width 187: "\x{1100}\x{1101}\x{1401}\x{1402}\x{1800}\x{1801}"
+        RenderBR {BR} at (188,91) size 0x0
+        RenderText {#text} at (1,98) size 222x28
+          text run at (1,98) width 222: "\x{2016}\x{2018}\x{2019}\x{2020}\x{2021}\x{2030}\x{2031}"
+        RenderBR {BR} at (222,121) size 1x0
+        RenderText {#text} at (1,126) size 247x28
+          text run at (1,126) width 247: "\x{203B}\x{203C}\x{203D}\x{2042}\x{2044}\x{2047}\x{2048}\x{2049}\x{2051}"
+        RenderBR {BR} at (247,149) size 1x0
+        RenderText {#text} at (1,158) size 392x28
+          text run at (1,158) width 392: "\x{2100}\x{2101}\x{2116}\x{2117}\x{2119}\x{211A}\x{2130}\x{2131}\x{2133}\x{2134}\x{213E}\x{213F}"
+        RenderBR {BR} at (392,181) size 1x0
+        RenderText {#text} at (1,196) size 150x28
+          text run at (1,196) width 150: "\x{2145}\x{2146}\x{2149}\x{214A}\x{214D}"
+        RenderBR {BR} at (151,219) size 0x0
+        RenderText {#text} at (1,234) size 568x28
+          text run at (1,234) width 282: "\x{2300}\x{2307}\x{230C}\x{231F}\x{2322}\x{232B}\x{237D}\x{239A} "
+          text run at (282,234) width 287: "\x{23B4}\x{23B6}\x{23BA}\x{23CF}\x{23D1}\x{23DB}\x{23E2}\x{24FF}"
+        RenderBR {BR} at (568,257) size 1x0
+        RenderText {#text} at (1,271) size 319x28
+          text run at (1,271) width 319: "\x{25A0}\x{2619}\x{2620}\x{2767}\x{2776}\x{2793}\x{2B12}\x{2B2F}\x{2E80}\x{2007}"
+        RenderBR {BR} at (319,294) size 1x0
+        RenderText {#text} at (1,309) size 327x28
+          text run at (1,309) width 327: "\x{3012}\x{3013}\x{3020}\x{302F}\x{3031}\x{309F}\x{30A1}\x{30FB}\x{30FD}"
+        RenderBR {BR} at (328,332) size 0x0
+        RenderText {#text} at (1,345) size 312x28
+          text run at (1,345) width 312: "\x{FE10}\x{FE30}\x{FE48}\x{FE50}\x{FE57}\x{FE5F}\x{FE62}\x{FE6}"
+        RenderBR {BR} at (313,368) size 0x0
+        RenderText {#text} at (1,381) size 390x28
+          text run at (1,381) width 390: "\x{FF01}\x{FF07}\x{FF0A}\x{FF0C}\x{FF0E}\x{FF19}\x{FF1F}\x{FF3A}\x{FF3C}\x{FF3E}"
+        RenderBR {BR} at (391,404) size 0x0
+        RenderText {#text} at (1,417) size 349x28
+          text run at (1,417) width 349: "\x{FF40}\x{FF5A}\x{FFE0}\x{FFE2}\x{FFE4}\x{FFFD}\x{D834}\x{DF00}\x{D83D}\x{DE4F}\x{D83D}\x{DE80}"
+        RenderBR {BR} at (349,440) size 1x0
+      RenderBlock {DIV} at (0,450) size 446x495 [border: (1px solid #0000FF)]
+        RenderText {#text} at (5,1) size 28x295
+          text run at (5,1) width 295: "\x{A7}\x{A9}\x{AE}\x{FF1B}\x{B6}\x{BC}\x{BD}\x{BE}"
+        RenderBR {BR} at (19,295) size 0x1
+        RenderText {#text} at (37,1) size 28x219
+          text run at (37,1) width 219: "\x{2E5}\x{2E6}\x{2E7}\x{2E8}\x{2E9}\x{2EA}\x{2EB}"
+        RenderBR {BR} at (42,219) size 0x1
+        RenderText {#text} at (67,1) size 28x197
+          text run at (67,1) width 197: "\x{1100}\x{1101}\x{1401}\x{1402}\x{1800}\x{1801}"
+        RenderBR {BR} at (81,198) size 0x0
+        RenderText {#text} at (97,1) size 28x223
+          text run at (97,1) width 223: "\x{2016}\x{2018}\x{2019}\x{2020}\x{2021}\x{2030}\x{2031}"
+        RenderBR {BR} at (102,223) size 0x1
+        RenderText {#text} at (125,1) size 28x293
+          text run at (125,1) width 293: "\x{203B}\x{203C}\x{203D}\x{2042}\x{2044}\x{2047}\x{2048}\x{2049}\x{2051}"
+        RenderBR {BR} at (130,293) size 0x1
+        RenderText {#text} at (157,1) size 28x403
+          text run at (157,1) width 403: "\x{2100}\x{2101}\x{2116}\x{2117}\x{2119}\x{211A}\x{2130}\x{2131}\x{2133}\x{2134}\x{213E}\x{213F}"
+        RenderBR {BR} at (162,403) size 0x1
+        RenderText {#text} at (195,1) size 28x170
+          text run at (195,1) width 170: "\x{2145}\x{2146}\x{2149}\x{214A}\x{214D}"
+        RenderBR {BR} at (200,170) size 0x1
+        RenderText {#text} at (233,1) size 28x493
+          text run at (233,1) width 262: "\x{2300}\x{2307}\x{230C}\x{231F}\x{2322}\x{232B}\x{237D}\x{239A} "
+          text run at (233,262) width 231: "\x{23B4}\x{23B6}\x{23BA}\x{23CF}\x{23D1}\x{23DB}\x{23E2}\x{24FF}"
+        RenderBR {BR} at (247,493) size 0x1
+        RenderText {#text} at (269,1) size 28x320
+          text run at (269,1) width 320: "\x{25A0}\x{2619}\x{2620}\x{2767}\x{2776}\x{2793}\x{2B12}\x{2B2F}\x{2E80}\x{2007}"
+        RenderBR {BR} at (283,320) size 0x1
+        RenderText {#text} at (305,1) size 28x350
+          text run at (305,1) width 350: "\x{3012}\x{3013}\x{3020}\x{302F}\x{3031}\x{309F}\x{30A1}\x{30FB}\x{30FD}"
+        RenderBR {BR} at (319,351) size 0x0
+        RenderText {#text} at (341,1) size 28x312
+          text run at (341,1) width 312: "\x{FE10}\x{FE30}\x{FE48}\x{FE50}\x{FE57}\x{FE5F}\x{FE62}\x{FE6}"
+        RenderBR {BR} at (355,313) size 0x0
+        RenderText {#text} at (377,1) size 28x390
+          text run at (377,1) width 390: "\x{FF01}\x{FF07}\x{FF0A}\x{FF0C}\x{FF0E}\x{FF19}\x{FF1F}\x{FF3A}\x{FF3C}\x{FF3E}"
+        RenderBR {BR} at (391,391) size 0x0
+        RenderText {#text} at (413,1) size 28x334
+          text run at (413,1) width 334: "\x{FF40}\x{FF5A}\x{FFE0}\x{FFE2}\x{FFE4}\x{FFFD}\x{D834}\x{DF00}\x{D83D}\x{DE4F}\x{D83D}\x{DE80}"
+        RenderBR {BR} at (427,334) size 0x1
\ No newline at end of file

Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (165130 => 165131)


--- branches/safari-537.75-branch/Source/WebCore/ChangeLog	2014-03-05 22:02:55 UTC (rev 165130)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog	2014-03-05 22:31:34 UTC (rev 165131)
@@ -1,5 +1,24 @@
 2014-03-05  Matthew Hanson  <[email protected]>
 
+        Merge r158697.
+
+    2013-11-05  Enrica Casucci  <[email protected]>
+
+            Full width semicolon is wrong in vertical text.
+            https://bugs.webkit.org/show_bug.cgi?id=123814
+            <rdar://problem/15312541>
+
+            Reviewed by Benjamin Poulain.
+
+            The full width semicolon should always be upright.
+            Adding it to the list of characters that should
+            ignore rotation.
+
+            * platform/graphics/FontGlyphs.cpp:
+            (WebCore::shouldIgnoreRotation):
+
+2014-03-05  Matthew Hanson  <[email protected]>
+
         Merge r163465.
 
     2014-02-04  Myles C. Maxfield  <[email protected]>

Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/FontGlyphs.cpp (165130 => 165131)


--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/FontGlyphs.cpp	2014-03-05 22:02:55 UTC (rev 165130)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/FontGlyphs.cpp	2014-03-05 22:31:34 UTC (rev 165131)
@@ -178,7 +178,7 @@
         return true;
 
     if (isInRange(character, 0x0FF01, 0x0FF07) || isInRange(character, 0x0FF0A, 0x0FF0C)
-        || isInRange(character, 0x0FF0E, 0x0FF19) || isInRange(character, 0x0FF1F, 0x0FF3A))
+        || isInRange(character, 0x0FF0E, 0x0FF19) || character == 0x0FF1B || isInRange(character, 0x0FF1F, 0x0FF3A))
         return true;
 
     if (character == 0x0FF3C || character == 0x0FF3E)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to