Changeset 192042 in webkit
- Timestamp:
- Nov 4, 2015, 4:26:26 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 7 edited
-
LayoutTests/ChangeLog (modified) (1 diff)
-
LayoutTests/fast/text/ruby-tatechuyoko-expected.html (added)
-
LayoutTests/fast/text/ruby-tatechuyoko.html (added)
-
LayoutTests/platform/mac-mavericks/fast/text/international/text-combine-image-test-expected.txt (modified) (2 diffs)
-
LayoutTests/platform/mac-mavericks/fast/text/tatechuyoko-expected.txt (modified) (1 diff)
-
LayoutTests/platform/mac/fast/text/international/text-combine-image-test-expected.txt (modified) (2 diffs)
-
LayoutTests/platform/mac/fast/text/tatechuyoko-expected.txt (modified) (1 diff)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/rendering/RenderCombineText.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r192041 r192042 1 2015-11-03 Myles C. Maxfield <mmaxfield@apple.com> 2 3 Ruby base ending in tatechuyoko forces a line break before the tatechuyoko 4 https://bugs.webkit.org/show_bug.cgi?id=150883 5 6 Reviewed by Darin Adler. 7 8 * platform/mac/fast/text/international/text-combine-image-test-expected.txt: Updated. 9 * platform/mac/fast/text/tatechuyoko-expected.txt: Ditto. 10 * fast/text/ruby-tatechuyoko-expected.html: Added. 11 * fast/text/ruby-tatechuyoko.html: Added. 12 1 13 2015-11-04 Ryan Haddad <ryanhaddad@apple.com> 2 14 -
trunk/LayoutTests/platform/mac-mavericks/fast/text/international/text-combine-image-test-expected.txt
r180271 r192042 99 99 RenderBlock {HR} at (0,0) size 2x584 [border: (1px inset #000000)] 100 100 RenderBlock {P} at (34,0) size 240x584 101 RenderBlock (floating) {SPAN} at (0,320) size 74x264 [border: (1px solid #FF0000)]101 RenderBlock (floating) {SPAN} at (0,320) size 38x264 [border: (1px solid #FF0000)] 102 102 RenderText {#text} at (7,1) size 24x118 103 103 text run at (7,1) width 118: "float:right:" … … 110 110 RenderCombineText {#text} at (7,166) size 24x25 111 111 text run at (7,166) width 24: "\x{FFFC}" 112 RenderText {#text} at ( 43,1) size 24x24113 text run at ( 43,1) width 24: "\x{6708}"114 RenderInline {SPAN} at (0,0) size 24x2 4115 RenderCombineText {#text} at ( 43,25) size 24x24116 text run at ( 43,25) width 24: "\x{FFFC}"117 RenderText {#text} at ( 43,49) size 24x24118 text run at ( 43,49) width 24: "\x{65E5}"112 RenderText {#text} at (7,190) size 24x25 113 text run at (7,190) width 24: "\x{6708}" 114 RenderInline {SPAN} at (0,0) size 24x25 115 RenderCombineText {#text} at (7,214) size 24x25 116 text run at (7,214) width 24: "\x{FFFC}" 117 RenderText {#text} at (7,238) size 24x25 118 text run at (7,238) width 24: "\x{65E5}" 119 119 RenderInline {SPAN} at (0,0) size 209x576 120 120 RenderText {#text} at (15,0) size 209x576 121 121 text run at (15,0) width 320: "\x{305D}\x{306E}\x{5973}\x{304C}\x{306D}\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}\x{3001}\x{308F}\x{305F}" 122 text run at (63,0) width 320: "\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}"123 text run at (111,0) width 576: "\x{306 E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}\x{304D}\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}"124 text run at (159,0) width 576: "\x{30 53}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}\x{8DB3}\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}"125 text run at (207,0) width 320: "\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}\x{306B}\x{3044}\x{308B}\x{3002}"122 text run at (63,0) width 576: "\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}\x{304D}" 123 text run at (111,0) width 576: "\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}\x{8DB3}" 124 text run at (159,0) width 576: "\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}" 125 text run at (207,0) width 64: "\x{306B}\x{3044}\x{308B}\x{3002}" 126 126 RenderText {#text} at (0,0) size 0x0 127 127 RenderBlock (anonymous) at (626,0) size 0x584 -
trunk/LayoutTests/platform/mac-mavericks/fast/text/tatechuyoko-expected.txt
r175264 r192042 19 19 RenderCombineText {#text} at (3,256) size 18x16 20 20 text run at (3,256) width 16: "\x{FFFC}" 21 RenderText {#text} at (3,272) size 42x5 6022 text run at (3,272) width 288: "\x{FF0C}\x{800C}\x{79D1}\x{689D}\x{5DDE}\x{90E1}\x{8CA1}\x{8CE6}\x{4E4B}\x{985E}\x{FF0C}\x{6B64}\x{56FA}\x{70BA}\x{6CBB}\x{4E4B}\x{5177}\x{3002}"23 text run at (27,0) width 304: "\x{7136}\x{65BD}\x{4E4B}\x{7576}\x{6709}\x{6B21}\x{7B2C}\x{3002}\x{4ECA}\x{65E5}\x{5148}\x{52D9}\x{FF0C}\x{6050}\x{7576}\x{555F}\x{8FEA}\x{4E3B}\x{5FC3}"21 RenderText {#text} at (3,272) size 42x576 22 text run at (3,272) width 304: "\x{FF0C}\x{800C}\x{79D1}\x{689D}\x{5DDE}\x{90E1}\x{8CA1}\x{8CE6}\x{4E4B}\x{985E}\x{FF0C}\x{6B64}\x{56FA}\x{70BA}\x{6CBB}\x{4E4B}\x{5177}\x{3002}\x{7136}" 23 text run at (27,0) width 288: "\x{65BD}\x{4E4B}\x{7576}\x{6709}\x{6B21}\x{7B2C}\x{3002}\x{4ECA}\x{65E5}\x{5148}\x{52D9}\x{FF0C}\x{6050}\x{7576}\x{555F}\x{8FEA}\x{4E3B}\x{5FC3}" -
trunk/LayoutTests/platform/mac/fast/text/international/text-combine-image-test-expected.txt
r180271 r192042 99 99 RenderBlock {HR} at (0,0) size 2x584 [border: (1px inset #000000)] 100 100 RenderBlock {P} at (34,0) size 240x584 101 RenderBlock (floating) {SPAN} at (0,320) size 74x264 [border: (1px solid #FF0000)]101 RenderBlock (floating) {SPAN} at (0,320) size 38x264 [border: (1px solid #FF0000)] 102 102 RenderText {#text} at (7,1) size 24x118 103 103 text run at (7,1) width 118: "float:right:" … … 110 110 RenderCombineText {#text} at (7,166) size 24x25 111 111 text run at (7,166) width 24: "\x{FFFC}" 112 RenderText {#text} at ( 43,1) size 24x24113 text run at ( 43,1) width 24: "\x{6708}"114 RenderInline {SPAN} at (0,0) size 24x2 4115 RenderCombineText {#text} at ( 43,25) size 24x24116 text run at ( 43,25) width 24: "\x{FFFC}"117 RenderText {#text} at ( 43,49) size 24x24118 text run at ( 43,49) width 24: "\x{65E5}"112 RenderText {#text} at (7,190) size 24x25 113 text run at (7,190) width 24: "\x{6708}" 114 RenderInline {SPAN} at (0,0) size 24x25 115 RenderCombineText {#text} at (7,214) size 24x25 116 text run at (7,214) width 24: "\x{FFFC}" 117 RenderText {#text} at (7,238) size 24x25 118 text run at (7,238) width 24: "\x{65E5}" 119 119 RenderInline {SPAN} at (0,0) size 209x576 120 120 RenderText {#text} at (15,0) size 209x576 121 121 text run at (15,0) width 320: "\x{305D}\x{306E}\x{5973}\x{304C}\x{306D}\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}\x{3001}\x{308F}\x{305F}" 122 text run at (63,0) width 320: "\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}"123 text run at (111,0) width 576: "\x{306 E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}\x{304D}\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}"124 text run at (159,0) width 576: "\x{30 53}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}\x{8DB3}\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}"125 text run at (207,0) width 320: "\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}\x{306B}\x{3044}\x{308B}\x{3002}"122 text run at (63,0) width 576: "\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}\x{304D}" 123 text run at (111,0) width 576: "\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}\x{8DB3}" 124 text run at (159,0) width 576: "\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}" 125 text run at (207,0) width 64: "\x{306B}\x{3044}\x{308B}\x{3002}" 126 126 RenderText {#text} at (0,0) size 0x0 127 127 RenderBlock (anonymous) at (623,0) size 0x584 -
trunk/LayoutTests/platform/mac/fast/text/tatechuyoko-expected.txt
r175236 r192042 19 19 RenderCombineText {#text} at (2,256) size 18x16 20 20 text run at (2,256) width 16: "\x{FFFC}" 21 RenderText {#text} at (2,272) size 40x5 6022 text run at (2,272) width 288: "\x{FF0C}\x{800C}\x{79D1}\x{689D}\x{5DDE}\x{90E1}\x{8CA1}\x{8CE6}\x{4E4B}\x{985E}\x{FF0C}\x{6B64}\x{56FA}\x{70BA}\x{6CBB}\x{4E4B}\x{5177}\x{3002}"23 text run at (24,0) width 304: "\x{7136}\x{65BD}\x{4E4B}\x{7576}\x{6709}\x{6B21}\x{7B2C}\x{3002}\x{4ECA}\x{65E5}\x{5148}\x{52D9}\x{FF0C}\x{6050}\x{7576}\x{555F}\x{8FEA}\x{4E3B}\x{5FC3}"21 RenderText {#text} at (2,272) size 40x576 22 text run at (2,272) width 304: "\x{FF0C}\x{800C}\x{79D1}\x{689D}\x{5DDE}\x{90E1}\x{8CA1}\x{8CE6}\x{4E4B}\x{985E}\x{FF0C}\x{6B64}\x{56FA}\x{70BA}\x{6CBB}\x{4E4B}\x{5177}\x{3002}\x{7136}" 23 text run at (24,0) width 288: "\x{65BD}\x{4E4B}\x{7576}\x{6709}\x{6B21}\x{7B2C}\x{3002}\x{4ECA}\x{65E5}\x{5148}\x{52D9}\x{FF0C}\x{6050}\x{7576}\x{555F}\x{8FEA}\x{4E3B}\x{5FC3}" -
trunk/Source/WebCore/ChangeLog
r192032 r192042 1 2015-11-03 Myles C. Maxfield <mmaxfield@apple.com> 2 3 Ruby base ending in tatechuyoko forces a line break before the tatechuyoko 4 https://bugs.webkit.org/show_bug.cgi?id=150883 5 6 Reviewed by Darin Adler. 7 8 Asking the width of a 0-length tatechuyoko should return 0. 9 10 Test: fast/text/ruby-tatechuyoko.html 11 12 * rendering/RenderCombineText.cpp: 13 (WebCore::RenderCombineText::width): 14 1 15 2015-11-04 Tim Horton <timothy_horton@apple.com> 2 16 -
trunk/Source/WebCore/rendering/RenderCombineText.cpp
r189830 r192042 62 62 { 63 63 if (m_isCombined) 64 return font.size();64 return !length ? 0 : font.size(); 65 65 66 66 return RenderText::width(from, length, font, xPosition, fallbackFonts, glyphOverflow);
Note:
See TracChangeset
for help on using the changeset viewer.
