Changeset 168575 in webkit
- Timestamp:
- May 10, 2014 12:23:01 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 39 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r168554 r168575 1 2014-05-10 Zalan Bujtas <zalan@apple.com> 2 3 Subpixel rendering: Empty rects should remain empty after integrally enclosing them. 4 https://bugs.webkit.org/show_bug.cgi?id=132753 5 <rdar://problem/16846801> 6 7 Reviewed by Simon Fraser. 8 9 This patch ensures that empty LayoutRects remain empty after converting to integral enclosing rect. 10 LayoutRects with fractional position get expanded even if they are empty. This makes rectangle 11 operations unreliable and can result in undesired side effects. 12 13 1px -> 0px progressions. 14 15 * platform/mac-mountainlion/fast/forms/fieldset-align-expected.txt: 16 * platform/mac-mountainlion/fast/forms/textAreaLineHeight-expected.txt: 17 * platform/mac/editing/selection/vertical-rl-rtl-extend-line-backward-br-expected.txt: 18 * platform/mac/editing/selection/vertical-rl-rtl-extend-line-backward-p-expected.txt: 19 * platform/mac/editing/selection/vertical-rl-rtl-extend-line-forward-br-expected.txt: 20 * platform/mac/editing/selection/vertical-rl-rtl-extend-line-forward-p-expected.txt: 21 * platform/mac/fast/css/css1_forward_compatible_parsing-expected.txt: 22 * platform/mac/fast/css/first-line-text-decoration-expected.txt: 23 * platform/mac/fast/css/h1-in-section-elements-expected.txt: 24 * platform/mac/fast/css/word-space-extra-expected.txt: 25 * platform/mac/fast/encoding/utf-16-big-endian-expected.txt: 26 * platform/mac/fast/encoding/utf-16-little-endian-expected.txt: 27 * platform/mac/fast/forms/fieldset-align-expected.txt: 28 * platform/mac/fast/forms/textAreaLineHeight-expected.txt: 29 * platform/mac/fast/inline/continuation-outlines-expected.txt: 30 * platform/mac/fast/inline/continuation-outlines-with-layers-expected.txt: 31 * platform/mac/fast/inline/outline-continuations-expected.txt: 32 * platform/mac/fast/invalid/nestedh3s-expected.txt: 33 * platform/mac/fast/multicol/client-rects-expected.txt: 34 * platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt: 35 * platform/mac/fast/multicol/client-rects-spanners-expected.txt: 36 * platform/mac/fast/multicol/newmulticol/client-rects-expected.txt: 37 * platform/mac/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt: 38 * platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.txt: 39 * platform/mac/fast/multicol/span/span-margin-collapsing-expected.txt: 40 * platform/mac/fast/overflow/clip-rects-fixed-ancestor-expected.txt: 41 * platform/mac/fast/table/014-expected.txt: 42 * platform/mac/fast/text/international/bidi-LDB-2-HTML-expected.txt: 43 * platform/mac/mathml/presentation/mo-stretch-expected.txt: 44 * platform/mac/svg/custom/use-font-face-crash-expected.txt: 45 * platform/mac/svg/wicd/rightsizing-grid-expected.txt: 46 * platform/mac/tables/mozilla/bugs/bug113235-1-expected.txt: 47 * platform/mac/tables/mozilla/bugs/bug113235-2-expected.txt: 48 * platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt: 49 * platform/mac/tables/mozilla/other/wa_table_tr_align-expected.txt: 50 1 51 2014-05-09 Alexey Proskuryakov <ap@apple.com> 2 52 -
trunk/LayoutTests/platform/mac-mountainlion/fast/forms/fieldset-align-expected.txt
r161906 r168575 39 39 RenderText {#text} at (0,0) size 147x18 40 40 text run at (0,0) width 147: "Legend align test, RTL" 41 RenderBlock (anonymous) at (0,328) size 769x 141 RenderBlock (anonymous) at (0,328) size 769x0 42 42 RenderInline {SPAN} at (0,0) size 0x0 43 43 RenderText {#text} at (0,0) size 0x0 … … 71 71 RenderTextControl {INPUT} at (612,2) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 72 72 RenderText {#text} at (0,0) size 0x0 73 RenderBlock (anonymous) at (0,562) size 769x 173 RenderBlock (anonymous) at (0,562) size 769x0 74 74 RenderInline {SPAN} at (0,0) size 0x0 75 75 RenderText {#text} at (0,0) size 0x0 … … 110 110 RenderText {#text} at (0,0) size 309x18 111 111 text run at (0,0) width 309: "Legend align test with margin and padding, RTL" 112 RenderBlock (anonymous) at (0,1026) size 769x 1112 RenderBlock (anonymous) at (0,1026) size 769x0 113 113 RenderInline {SPAN} at (0,0) size 0x0 114 114 RenderText {#text} at (0,0) size 0x0 … … 142 142 RenderTextControl {INPUT} at (580,2) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 143 143 RenderText {#text} at (0,0) size 0x0 144 RenderBlock (anonymous) at (0,1378) size 769x 1144 RenderBlock (anonymous) at (0,1378) size 769x0 145 145 RenderInline {SPAN} at (0,0) size 0x0 146 146 RenderText {#text} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac-mountainlion/fast/forms/textAreaLineHeight-expected.txt
r161906 r168575 52 52 RenderBR {BR} at (213,188) size 0x18 53 53 RenderText {#text} at (0,0) size 0x0 54 RenderBlock {P} at (0,1199) size 769x 154 RenderBlock {P} at (0,1199) size 769x0 55 55 layer at (8,60) size 406x206 clip at (9,61) size 404x204 56 56 RenderTextControl {TEXTAREA} at (0,18) size 406x206 [bgcolor=#FFFFFF] [border: (1px dotted #C0C0C0)] -
trunk/LayoutTests/platform/mac/editing/selection/vertical-rl-rtl-extend-line-backward-br-expected.txt
r161884 r168575 14 14 RenderText {#text} at (25,28) size 23x107 15 15 text run at (25,28) width 107 RTL: "\x{5D0}\x{5D9}\x{5DF} \x{5DC}\x{5D9} \x{5E9}\x{5DD}." 16 RenderBlock {PRE} at (0,182) size 784x 116 RenderBlock {PRE} at (0,182) size 784x0 17 17 selection start: position 5 of child 0 {#text} of child 1 {P} of child 3 {DIV} of body 18 18 selection end: position 5 of child 2 {#text} of child 1 {P} of child 3 {DIV} of body -
trunk/LayoutTests/platform/mac/editing/selection/vertical-rl-rtl-extend-line-backward-p-expected.txt
r161884 r168575 14 14 RenderText {#text} at (1,28) size 23x107 15 15 text run at (1,28) width 107 RTL: "\x{5D0}\x{5D9}\x{5DF} \x{5DC}\x{5D9} \x{5E9}\x{5DD}." 16 RenderBlock {PRE} at (0,182) size 784x 116 RenderBlock {PRE} at (0,182) size 784x0 17 17 selection start: position 5 of child 0 {#text} of child 1 {P} of child 3 {DIV} of body 18 18 selection end: position 5 of child 0 {#text} of child 2 {P} of child 3 {DIV} of body -
trunk/LayoutTests/platform/mac/editing/selection/vertical-rl-rtl-extend-line-forward-br-expected.txt
r161884 r168575 14 14 RenderText {#text} at (25,28) size 23x107 15 15 text run at (25,28) width 107 RTL: "\x{5D0}\x{5D9}\x{5DF} \x{5DC}\x{5D9} \x{5E9}\x{5DD}." 16 RenderBlock {PRE} at (0,182) size 784x 116 RenderBlock {PRE} at (0,182) size 784x0 17 17 selection start: position 5 of child 0 {#text} of child 1 {P} of child 3 {DIV} of body 18 18 selection end: position 6 of child 2 {#text} of child 1 {P} of child 3 {DIV} of body -
trunk/LayoutTests/platform/mac/editing/selection/vertical-rl-rtl-extend-line-forward-p-expected.txt
r161884 r168575 14 14 RenderText {#text} at (1,28) size 23x107 15 15 text run at (1,28) width 107 RTL: "\x{5D0}\x{5D9}\x{5DF} \x{5DC}\x{5D9} \x{5E9}\x{5DD}." 16 RenderBlock {PRE} at (0,182) size 784x 116 RenderBlock {PRE} at (0,182) size 784x0 17 17 selection start: position 5 of child 0 {#text} of child 1 {P} of child 3 {DIV} of body 18 18 selection end: position 6 of child 0 {#text} of child 2 {P} of child 3 {DIV} of body -
trunk/LayoutTests/platform/mac/fast/css/css1_forward_compatible_parsing-expected.txt
r161884 r168575 38 38 RenderText {#text} at (98,0) size 4x18 39 39 text run at (98,0) width 4: "." 40 RenderBlock (anonymous) at (0,385) size 784x 140 RenderBlock (anonymous) at (0,385) size 784x0 41 41 RenderInline {A} at (0,0) size 0x0 42 42 RenderText {#text} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/fast/css/first-line-text-decoration-expected.txt
r161884 r168575 21 21 RenderBlock (anonymous) at (0,165) size 784x19 22 22 RenderBR {BR} at (0,0) size 0x18 23 RenderBlock {P} at (0,199) size 784x 123 RenderBlock {P} at (0,199) size 784x0 24 24 RenderBlock {P} at (0,199) size 784x19 25 25 RenderText {#text} at (0,0) size 485x18 … … 36 36 RenderBlock (anonymous) at (0,317) size 784x19 37 37 RenderBR {BR} at (0,0) size 0x18 38 RenderBlock {P} at (0,351) size 784x 138 RenderBlock {P} at (0,351) size 784x0 39 39 RenderBlock {P} at (0,351) size 784x19 40 40 RenderText {#text} at (0,0) size 559x18 … … 51 51 RenderBlock (anonymous) at (0,469) size 784x19 52 52 RenderBR {BR} at (0,0) size 0x18 53 RenderBlock {P} at (0,503) size 784x 153 RenderBlock {P} at (0,503) size 784x0 -
trunk/LayoutTests/platform/mac/fast/css/h1-in-section-elements-expected.txt
r161884 r168575 85 85 text run at (1,1) width 30: "MMM" 86 86 RenderBlock {HR} at (0,66) size 71x3 [border: (1px inset #000000)] 87 RenderBlock {DIV} at (0,68) size 71x 187 RenderBlock {DIV} at (0,68) size 71x0 88 88 RenderTableCell {TD} at (77,289) size 73x71 [r=4 c=1 rs=1 cs=1] 89 89 RenderBlock {HR} at (1,1) size 71x2 [border: (1px inset #000000)] … … 169 169 text run at (1,1) width 30: "MMM" 170 170 RenderBlock {HR} at (66,0) size 3x71 [border: (1px inset #000000)] 171 RenderBlock {DIV} at (68,0) size 1x71171 RenderBlock {DIV} at (68,0) size 0x71 172 172 RenderTableCell {TD} at (289,77) size 71x73 [r=4 c=1 rs=1 cs=1] 173 173 RenderBlock {HR} at (1,1) size 2x71 [border: (1px inset #000000)] -
trunk/LayoutTests/platform/mac/fast/css/word-space-extra-expected.txt
r161884 r168575 285 285 text run at (596,105) width 492: ". (with monospace font from elements to too)" 286 286 text run at (1108,105) width 0: " " 287 RenderBlock (anonymous) at (0,421) size 769x 1287 RenderBlock (anonymous) at (0,421) size 769x0 288 288 RenderInline {SPAN} at (0,0) size 0x0 289 289 RenderText {#text} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/fast/encoding/utf-16-big-endian-expected.txt
r161884 r168575 71 71 RenderBR {BR} at (130,15) size 0x0 72 72 RenderText {#text} at (0,0) size 0x0 73 RenderBlock (anonymous) at (0,277) size 769x 173 RenderBlock (anonymous) at (0,277) size 769x0 74 74 RenderInline {SPAN} at (0,0) size 0x0 75 75 RenderInline {SPAN} at (0,0) size 0x0 … … 111 111 RenderText {#text} at (1,37) size 416x17 112 112 text run at (1,37) width 416: "Comments: -** TICKETLESS CONF CODE IS WHGNSO**" 113 RenderBlock (anonymous) at (0,374) size 769x 1113 RenderBlock (anonymous) at (0,374) size 769x0 114 114 RenderInline {SPAN} at (0,0) size 0x0 115 115 RenderInline {SPAN} at (0,0) size 0x0 … … 119 119 RenderBlock (anonymous) at (0,380) size 769x3 120 120 RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)] 121 RenderBlock (anonymous) at (0,389) size 769x 1121 RenderBlock (anonymous) at (0,389) size 769x0 122 122 RenderInline {SPAN} at (0,0) size 0x0 123 123 RenderInline {SPAN} at (0,0) size 0x0 … … 207 207 RenderInline {SPACE} at (0,0) size 0x17 208 208 RenderBR {BR} at (0,0) size 0x17 209 RenderBlock (anonymous) at (0,585) size 769x 1209 RenderBlock (anonymous) at (0,585) size 769x0 210 210 RenderInline {SPAN} at (0,0) size 0x0 211 211 RenderInline {SPAN} at (0,0) size 0x0 … … 215 215 RenderBlock (anonymous) at (0,592) size 769x3 216 216 RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)] 217 RenderBlock (anonymous) at (0,600) size 769x 1217 RenderBlock (anonymous) at (0,600) size 769x0 218 218 RenderInline {SPAN} at (0,0) size 0x0 219 219 RenderInline {SPAN} at (0,0) size 0x0 … … 303 303 RenderInline {SPACE} at (0,0) size 0x17 304 304 RenderBR {BR} at (0,0) size 0x17 305 RenderBlock (anonymous) at (0,796) size 769x 1305 RenderBlock (anonymous) at (0,796) size 769x0 306 306 RenderInline {SPAN} at (0,0) size 0x0 307 307 RenderInline {SPAN} at (0,0) size 0x0 … … 311 311 RenderBlock (anonymous) at (0,803) size 769x3 312 312 RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)] 313 RenderBlock (anonymous) at (0,812) size 769x 1313 RenderBlock (anonymous) at (0,812) size 769x0 314 314 RenderInline {SPAN} at (0,0) size 0x0 315 315 RenderInline {SPAN} at (0,0) size 0x0 … … 356 356 text run at (241,91) width 4: " " 357 357 RenderBR {BR} at (245,105) size 0x0 358 RenderBlock (anonymous) at (0,926) size 769x 1358 RenderBlock (anonymous) at (0,926) size 769x0 359 359 RenderInline {SPAN} at (0,0) size 0x0 360 360 RenderInline {SPAN} at (0,0) size 0x0 … … 428 428 text run at (204,0) width 163: "Click here for latest updates" 429 429 RenderText {#text} at (0,0) size 0x0 430 RenderBlock (anonymous) at (0,1113) size 769x 1430 RenderBlock (anonymous) at (0,1113) size 769x0 431 431 RenderInline {SPAN} at (0,0) size 0x0 432 432 RenderInline {SPAN} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/fast/encoding/utf-16-little-endian-expected.txt
r161884 r168575 71 71 RenderBR {BR} at (130,15) size 0x0 72 72 RenderText {#text} at (0,0) size 0x0 73 RenderBlock (anonymous) at (0,277) size 769x 173 RenderBlock (anonymous) at (0,277) size 769x0 74 74 RenderInline {SPAN} at (0,0) size 0x0 75 75 RenderInline {SPAN} at (0,0) size 0x0 … … 111 111 RenderText {#text} at (1,37) size 416x17 112 112 text run at (1,37) width 416: "Comments: -** TICKETLESS CONF CODE IS WHGNSO**" 113 RenderBlock (anonymous) at (0,374) size 769x 1113 RenderBlock (anonymous) at (0,374) size 769x0 114 114 RenderInline {SPAN} at (0,0) size 0x0 115 115 RenderInline {SPAN} at (0,0) size 0x0 … … 119 119 RenderBlock (anonymous) at (0,380) size 769x3 120 120 RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)] 121 RenderBlock (anonymous) at (0,389) size 769x 1121 RenderBlock (anonymous) at (0,389) size 769x0 122 122 RenderInline {SPAN} at (0,0) size 0x0 123 123 RenderInline {SPAN} at (0,0) size 0x0 … … 207 207 RenderInline {SPACE} at (0,0) size 0x17 208 208 RenderBR {BR} at (0,0) size 0x17 209 RenderBlock (anonymous) at (0,585) size 769x 1209 RenderBlock (anonymous) at (0,585) size 769x0 210 210 RenderInline {SPAN} at (0,0) size 0x0 211 211 RenderInline {SPAN} at (0,0) size 0x0 … … 215 215 RenderBlock (anonymous) at (0,592) size 769x3 216 216 RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)] 217 RenderBlock (anonymous) at (0,600) size 769x 1217 RenderBlock (anonymous) at (0,600) size 769x0 218 218 RenderInline {SPAN} at (0,0) size 0x0 219 219 RenderInline {SPAN} at (0,0) size 0x0 … … 303 303 RenderInline {SPACE} at (0,0) size 0x17 304 304 RenderBR {BR} at (0,0) size 0x17 305 RenderBlock (anonymous) at (0,796) size 769x 1305 RenderBlock (anonymous) at (0,796) size 769x0 306 306 RenderInline {SPAN} at (0,0) size 0x0 307 307 RenderInline {SPAN} at (0,0) size 0x0 … … 311 311 RenderBlock (anonymous) at (0,803) size 769x3 312 312 RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)] 313 RenderBlock (anonymous) at (0,812) size 769x 1313 RenderBlock (anonymous) at (0,812) size 769x0 314 314 RenderInline {SPAN} at (0,0) size 0x0 315 315 RenderInline {SPAN} at (0,0) size 0x0 … … 356 356 text run at (241,91) width 4: " " 357 357 RenderBR {BR} at (245,105) size 0x0 358 RenderBlock (anonymous) at (0,926) size 769x 1358 RenderBlock (anonymous) at (0,926) size 769x0 359 359 RenderInline {SPAN} at (0,0) size 0x0 360 360 RenderInline {SPAN} at (0,0) size 0x0 … … 428 428 text run at (204,0) width 163: "Click here for latest updates" 429 429 RenderText {#text} at (0,0) size 0x0 430 RenderBlock (anonymous) at (0,1113) size 769x 1430 RenderBlock (anonymous) at (0,1113) size 769x0 431 431 RenderInline {SPAN} at (0,0) size 0x0 432 432 RenderInline {SPAN} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/fast/forms/fieldset-align-expected.txt
r161884 r168575 39 39 RenderText {#text} at (0,0) size 147x18 40 40 text run at (0,0) width 147: "Legend align test, RTL" 41 RenderBlock (anonymous) at (0,328) size 769x 141 RenderBlock (anonymous) at (0,328) size 769x0 42 42 RenderInline {SPAN} at (0,0) size 0x0 43 43 RenderText {#text} at (0,0) size 0x0 … … 71 71 RenderTextControl {INPUT} at (589,2) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 72 72 RenderText {#text} at (0,0) size 0x0 73 RenderBlock (anonymous) at (0,562) size 769x 173 RenderBlock (anonymous) at (0,562) size 769x0 74 74 RenderInline {SPAN} at (0,0) size 0x0 75 75 RenderText {#text} at (0,0) size 0x0 … … 110 110 RenderText {#text} at (0,0) size 309x18 111 111 text run at (0,0) width 309: "Legend align test with margin and padding, RTL" 112 RenderBlock (anonymous) at (0,1026) size 769x 1112 RenderBlock (anonymous) at (0,1026) size 769x0 113 113 RenderInline {SPAN} at (0,0) size 0x0 114 114 RenderText {#text} at (0,0) size 0x0 … … 142 142 RenderTextControl {INPUT} at (557,2) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 143 143 RenderText {#text} at (0,0) size 0x0 144 RenderBlock (anonymous) at (0,1378) size 769x 1144 RenderBlock (anonymous) at (0,1378) size 769x0 145 145 RenderInline {SPAN} at (0,0) size 0x0 146 146 RenderText {#text} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/fast/forms/textAreaLineHeight-expected.txt
r161884 r168575 52 52 RenderBR {BR} at (213,188) size 0x18 53 53 RenderText {#text} at (0,0) size 0x0 54 RenderBlock {P} at (0,1199) size 769x 154 RenderBlock {P} at (0,1199) size 769x0 55 55 layer at (8,60) size 406x206 clip at (9,61) size 404x204 56 56 RenderTextControl {TEXTAREA} at (0,18) size 406x206 [bgcolor=#FFFFFF] [border: (1px dotted #C0C0C0)] -
trunk/LayoutTests/platform/mac/fast/inline/continuation-outlines-expected.txt
r161884 r168575 40 40 RenderText {#text} at (0,0) size 177x22 41 41 text run at (0,0) width 177: "But No Content After" 42 RenderBlock (anonymous) at (0,77) size 784x 142 RenderBlock (anonymous) at (0,77) size 784x0 43 43 RenderInline {SPAN} at (0,0) size 0x0 44 44 RenderBlock {DIV} at (0,300) size 784x23 … … 49 49 RenderText {#text} at (0,0) size 216x22 50 50 text run at (0,0) width 216: "No content before or after." 51 RenderBlock (anonymous) at (0,40) size 784x 151 RenderBlock (anonymous) at (0,40) size 784x0 52 52 RenderInline {SPAN} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/fast/inline/continuation-outlines-with-layers-expected.txt
r161884 r168575 15 15 RenderBlock {DIV} at (0,222) size 784x60 16 16 RenderBlock (anonymous) at (0,0) size 784x18 17 RenderBlock (anonymous) at (0,77) size 784x 117 RenderBlock (anonymous) at (0,77) size 784x0 18 18 RenderBlock {DIV} at (0,300) size 784x23 19 19 RenderBlock (anonymous) at (0,0) size 784x0 20 RenderBlock (anonymous) at (0,40) size 784x 120 RenderBlock (anonymous) at (0,40) size 784x0 21 21 layer at (8,50) size 98x18 22 22 RenderInline (relative positioned) {SPAN} at (0,0) size 98x18 -
trunk/LayoutTests/platform/mac/fast/inline/outline-continuations-expected.txt
r161884 r168575 10 10 RenderText {#text} at (0,0) size 50x22 11 11 text run at (0,0) width 50: "TEXT" 12 RenderBlock (anonymous) at (0,41) size 784x 112 RenderBlock (anonymous) at (0,41) size 784x0 13 13 RenderBlock {P} at (0,0) size 784x0 14 RenderBlock (anonymous) at (0,41) size 784x 114 RenderBlock (anonymous) at (0,41) size 784x0 15 15 RenderInline {BIG} at (0,0) size 0x0 16 16 RenderInline {PARSERERROR} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/fast/invalid/nestedh3s-expected.txt
r161884 r168575 29 29 RenderText {#text} at (4,4) size 64x36 30 30 text run at (4,4) width 64: "Four" 31 RenderBlock (anonymous) at (4,138) size 760x 131 RenderBlock (anonymous) at (4,138) size 760x0 32 32 RenderInline {I} at (0,0) size 0x0 33 RenderBlock (anonymous) at (4,224) size 768x 133 RenderBlock (anonymous) at (4,224) size 768x0 34 34 RenderInline {I} at (0,0) size 0x0 35 RenderBlock (anonymous) at (4,297) size 776x 135 RenderBlock (anonymous) at (4,297) size 776x0 36 36 RenderInline {I} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/fast/multicol/client-rects-expected.txt
r168380 r168575 116 116 RenderSlider {INPUT} at (2,27) size 25x25 [color=#909090] [bgcolor=#ADD8E6] 117 117 RenderFlexibleBox {DIV} at (0,0) size 25x25 118 RenderBlock {DIV} at (0,12) size 25x 1118 RenderBlock {DIV} at (0,12) size 25x0 119 119 RenderBlock {DIV} at (0,0) size 25x0 120 120 layer at (608,63) size 116x66 … … 191 191 RenderSlider {INPUT} at (27,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6] 192 192 RenderFlexibleBox {DIV} at (0,0) size 25x25 193 RenderBlock {DIV} at (0,12) size 25x 1193 RenderBlock {DIV} at (0,12) size 25x0 194 194 RenderBlock {DIV} at (0,0) size 25x0 195 195 layer at (588,143) size 66x116 … … 266 266 RenderSlider {INPUT} at (27,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6] 267 267 RenderFlexibleBox {DIV} at (0,0) size 25x25 268 RenderBlock {DIV} at (0,12) size 25x 1268 RenderBlock {DIV} at (0,12) size 25x0 269 269 RenderBlock {DIV} at (0,0) size 25x0 270 270 layer at (468,263) size 66x116 -
trunk/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt
r168380 r168575 137 137 RenderSlider {INPUT} at (2,32) size 25x25 [color=#909090] [bgcolor=#ADD8E6] 138 138 RenderFlexibleBox {DIV} at (0,0) size 25x25 139 RenderBlock {DIV} at (0,12) size 25x 1139 RenderBlock {DIV} at (0,12) size 25x0 140 140 RenderBlock {DIV} at (0,0) size 25x0 141 141 layer at (608,81) size 116x106 … … 242 242 RenderSlider {INPUT} at (32,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6] 243 243 RenderFlexibleBox {DIV} at (0,0) size 25x25 244 RenderBlock {DIV} at (0,12) size 25x 1244 RenderBlock {DIV} at (0,12) size 25x0 245 245 RenderBlock {DIV} at (0,0) size 25x0 246 246 layer at (18,327) size 106x116 … … 347 347 RenderSlider {INPUT} at (32,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6] 348 348 RenderFlexibleBox {DIV} at (0,0) size 25x25 349 RenderBlock {DIV} at (0,12) size 25x 1349 RenderBlock {DIV} at (0,12) size 25x0 350 350 RenderBlock {DIV} at (0,0) size 25x0 351 351 layer at (148,447) size 106x116 -
trunk/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.txt
r168380 r168575 129 129 RenderSlider {INPUT} at (2,27) size 25x25 [color=#909090] [bgcolor=#ADD8E6] 130 130 RenderFlexibleBox {DIV} at (0,0) size 25x25 131 RenderBlock {DIV} at (0,12) size 25x 1131 RenderBlock {DIV} at (0,12) size 25x0 132 132 RenderBlock {DIV} at (0,0) size 25x0 133 133 layer at (608,63) size 116x76 … … 220 220 RenderSlider {INPUT} at (27,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6] 221 221 RenderFlexibleBox {DIV} at (0,0) size 25x25 222 RenderBlock {DIV} at (0,12) size 25x 1222 RenderBlock {DIV} at (0,12) size 25x0 223 223 RenderBlock {DIV} at (0,0) size 25x0 224 224 layer at (638,153) size 76x116 … … 311 311 RenderSlider {INPUT} at (27,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6] 312 312 RenderFlexibleBox {DIV} at (0,0) size 25x25 313 RenderBlock {DIV} at (0,12) size 25x 1313 RenderBlock {DIV} at (0,12) size 25x0 314 314 RenderBlock {DIV} at (0,0) size 25x0 315 315 layer at (618,273) size 76x116 -
trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt
r168380 r168575 116 116 RenderSlider {INPUT} at (2,27) size 25x25 [color=#909090] [bgcolor=#ADD8E6] 117 117 RenderFlexibleBox {DIV} at (0,0) size 25x25 118 RenderBlock {DIV} at (0,12) size 25x 1118 RenderBlock {DIV} at (0,12) size 25x0 119 119 RenderBlock {DIV} at (0,0) size 25x0 120 120 layer at (608,63) size 116x66 … … 191 191 RenderSlider {INPUT} at (27,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6] 192 192 RenderFlexibleBox {DIV} at (0,0) size 25x25 193 RenderBlock {DIV} at (0,12) size 25x 1193 RenderBlock {DIV} at (0,12) size 25x0 194 194 RenderBlock {DIV} at (0,0) size 25x0 195 195 layer at (588,143) size 66x116 … … 266 266 RenderSlider {INPUT} at (27,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6] 267 267 RenderFlexibleBox {DIV} at (0,0) size 25x25 268 RenderBlock {DIV} at (0,12) size 25x 1268 RenderBlock {DIV} at (0,12) size 25x0 269 269 RenderBlock {DIV} at (0,0) size 25x0 270 270 layer at (468,263) size 66x116 -
trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt
r168076 r168575 57 57 RenderText {#text} at (0,0) size 276x28 58 58 text run at (0,0) width 276: "This is a spanning element." 59 RenderMultiColumnSet at (5,378) size 750x 159 RenderMultiColumnSet at (5,378) size 750x0 60 60 layer at (13,421) size 367x612 61 61 RenderMultiColumnFlowThread at (5,5) size 367x612 -
trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.txt
r168076 r168575 57 57 RenderText {#text} at (0,0) size 600x28 58 58 text run at (0,0) width 600: "This is a spanning element at the end of the columns block." 59 RenderMultiColumnSet at (5,378) size 750x 159 RenderMultiColumnSet at (5,378) size 750x0 60 60 layer at (13,421) size 367x612 61 61 RenderMultiColumnFlowThread at (5,5) size 367x612 … … 305 305 text run at (0,0) width 707: "This is a spanning element at the end of the columns block with block" 306 306 text run at (0,28) width 83: "siblings." 307 RenderMultiColumnSet at (5,438) size 750x 1307 RenderMultiColumnSet at (5,438) size 750x0 308 308 layer at (13,2480) size 367x658 309 309 RenderMultiColumnFlowThread at (5,5) size 367x658 -
trunk/LayoutTests/platform/mac/fast/multicol/span/span-margin-collapsing-expected.txt
r168076 r168575 61 61 text run at (606,0) width 90: "It should" 62 62 text run at (0,28) width 504: "collapse its margins with the h2 in the next block." 63 RenderMultiColumnSet at (0,401) size 750x 163 RenderMultiColumnSet at (0,401) size 750x0 64 64 layer at (8,434) size 367x612 65 65 RenderMultiColumnFlowThread at (0,0) size 367x612 … … 160 160 text run at (640,0) width 90: "It should" 161 161 text run at (0,28) width 569: "collapse its margins with the spanning element below it." 162 RenderMultiColumnSet at (0,293) size 750x 1162 RenderMultiColumnSet at (0,293) size 750x0 163 163 RenderBlock {H2} at (0,293) size 750x57 [bgcolor=#CCCCCC] 164 164 RenderText {#text} at (0,0) size 730x56 -
trunk/LayoutTests/platform/mac/fast/overflow/clip-rects-fixed-ancestor-expected.txt
r161884 r168575 7 7 RenderText {#text} at (0,0) size 287x18 8 8 text run at (0,0) width 287: "Safari Fixed / Overflow Hidden Scroll Bug" 9 RenderBlock {PRE} at (0,39) size 769x 19 RenderBlock {PRE} at (0,39) size 769x0 10 10 RenderBlock {PRE} at (0,39) size 769x496 11 11 RenderText {#text} at (0,0) size 264x495 -
trunk/LayoutTests/platform/mac/fast/table/014-expected.txt
r161884 r168575 7 7 RenderImage {IMG} at (0,0) size 132x86 8 8 RenderText {#text} at (0,0) size 0x0 9 RenderBlock {H2} at (0,105) size 784x 19 RenderBlock {H2} at (0,105) size 784x0 10 10 RenderTable {TABLE} at (0,105) size 132x37 11 11 RenderTableSection {TBODY} at (0,0) size 132x36 -
trunk/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-HTML-expected.txt
r161884 r168575 25 25 RenderText {#text} at (499,0) size 4x18 26 26 text run at (499,0) width 4: "." 27 RenderBlock {PRE} at (0,92) size 784x 127 RenderBlock {PRE} at (0,92) size 784x0 28 28 RenderBlock {P} at (0,92) size 784x19 29 29 RenderText {#text} at (0,0) size 281x18 -
trunk/LayoutTests/platform/mac/mathml/presentation/mo-stretch-expected.txt
r165461 r168575 151 151 RenderText at (0,-5) size 8x24 152 152 text run at (0,-5) width 8: "\x{2225}" 153 RenderMathMLSpace {mspace} at (123,0) size 1x76153 RenderMathMLSpace {mspace} at (123,0) size 0x76 154 154 RenderText {#text} at (125,85) size 5x18 155 155 text run at (125,85) width 5: " " … … 226 226 RenderText at (0,-5) size 8x24 227 227 text run at (0,-5) width 8: "\x{2225}" 228 RenderMathMLSpace {mspace} at (123,0) size 1x51228 RenderMathMLSpace {mspace} at (123,0) size 0x51 229 229 RenderText {#text} at (254,85) size 5x18 230 230 text run at (254,85) width 5: " " … … 301 301 RenderText at (0,-5) size 8x24 302 302 text run at (0,-5) width 8: "\x{2225}" 303 RenderMathMLSpace {mspace} at (123,0) size 1x21303 RenderMathMLSpace {mspace} at (123,0) size 0x21 304 304 RenderText {#text} at (383,85) size 5x18 305 305 text run at (383,85) width 5: " " … … 378 378 RenderText at (0,-5) size 8x24 379 379 text run at (0,-5) width 8: "\x{2225}" 380 RenderMathMLSpace {mspace} at (123,0) size 1x41380 RenderMathMLSpace {mspace} at (123,0) size 0x41 381 381 RenderText {#text} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/svg/custom/use-font-face-crash-expected.txt
r168350 r168575 20 20 RenderSVGInlineText {#text} at (0,0) size 335x18 21 21 chunk 1 text run 1 at (0.00,20.00) startOffset 0 endOffset 53 width 335.00: "This should not crash, but display an error document." 22 RenderSVGContainer {use} at (8,168) size 0x 122 RenderSVGContainer {use} at (8,168) size 0x0 -
trunk/LayoutTests/platform/mac/svg/wicd/rightsizing-grid-expected.txt
r168350 r168575 11 11 RenderText {#text} at (0,0) size 149x18 12 12 text run at (0,0) width 149: "WICD Core 1.0 #20-3" 13 RenderBlock {p} at (0,119) size 769x 113 RenderBlock {p} at (0,119) size 769x0 14 14 RenderEmbeddedObject {object} at (0,0) size 385x128 15 15 layer at (0,0) size 385x128 -
trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-1-expected.txt
r161884 r168575 4253 4253 RenderText {#text} at (1,1) size 8x17 4254 4254 text run at (1,1) width 8: "x" 4255 RenderBlock (anonymous) at (2,11376) size 715x 14255 RenderBlock (anonymous) at (2,11376) size 715x0 4256 4256 RenderInline {FONT} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-2-expected.txt
r161884 r168575 19 19 RenderTableSection {TBODY} at (0,0) size 4x4 20 20 RenderTableRow {TR} at (0,2) size 4x0 21 RenderBlock (anonymous) at (0,74) size 784x 121 RenderBlock (anonymous) at (0,74) size 784x0 22 22 RenderInline {FONT} at (0,0) size 0x0 -
trunk/LayoutTests/platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.txt
r161884 r168575 482 482 RenderText {#text} at (2,2) size 31x18 483 483 text run at (2,2) width 31: "col 9" 484 RenderBlock {P} at (0,1090) size 769x 1484 RenderBlock {P} at (0,1090) size 769x0 485 485 RenderBlock {HR} at (0,1090) size 769x3 [border: (1px inset #000000)] 486 486 RenderBlock {P} at (0,1108) size 769x62 … … 873 873 RenderText {#text} at (2,2) size 31x18 874 874 text run at (2,2) width 31: "col 9" 875 RenderBlock {P} at (0,1667) size 769x 1875 RenderBlock {P} at (0,1667) size 769x0 876 876 RenderBlock {HR} at (0,1667) size 769x3 [border: (1px inset #000000)] 877 877 RenderBlock {P} at (0,1685) size 769x62 … … 1318 1318 text run at (2,2) width 19: "col" 1319 1319 text run at (2,20) width 8: "9" 1320 RenderBlock {P} at (0,2272) size 769x 11320 RenderBlock {P} at (0,2272) size 769x0 1321 1321 RenderBlock {HR} at (0,2272) size 769x3 [border: (1px inset #000000)] 1322 1322 RenderBlock (anonymous) at (0,2282) size 769x19 -
trunk/LayoutTests/platform/mac/tables/mozilla/other/wa_table_tr_align-expected.txt
r161884 r168575 309 309 RenderText {#text} at (43,2) size 67x18 310 310 text run at (43,2) width 67: "row data 3" 311 RenderBlock {P} at (0,1222) size 769x 1311 RenderBlock {P} at (0,1222) size 769x0 312 312 RenderBlock {HR} at (0,1222) size 769x3 [border: (1px inset #000000)] 313 313 RenderBlock (anonymous) at (0,1232) size 769x19 … … 321 321 RenderBlock {P} at (0,1266) size 769x19 322 322 RenderBR {BR} at (0,0) size 0x18 323 RenderBlock {P} at (0,1300) size 769x 1323 RenderBlock {P} at (0,1300) size 769x0 -
trunk/Source/WebCore/ChangeLog
r168570 r168575 1 2014-05-10 Zalan Bujtas <zalan@apple.com> 2 3 Subpixel rendering: Empty rects should remain empty after integrally enclosing them. 4 https://bugs.webkit.org/show_bug.cgi?id=132753 5 <rdar://problem/16846801> 6 7 Reviewed by Simon Fraser. 8 9 This patch ensures that empty LayoutRects remain empty after converting to integral enclosing rect. 10 LayoutRects with fractional position get expanded even if they are empty. This makes rectangle 11 operations unreliable and can result in undesired side effects. 12 13 No testable/covered by existing tests. 14 15 * platform/graphics/LayoutRect.cpp: 16 (WebCore::enclosingIntRect): 17 * rendering/InlineTextBox.cpp: 18 (WebCore::InlineTextBox::localSelectionRect): 19 (WebCore::InlineTextBox::paintDocumentMarker): 20 (WebCore::InlineTextBox::paintTextMatchMarker): 21 (WebCore::InlineTextBox::computeRectForReplacementMarker): 22 (WebCore::integralEnclosingRectForSelection): Deleted. 23 1 24 2014-05-09 Joseph Pecoraro <pecoraro@apple.com> 2 25 -
trunk/Source/WebCore/platform/graphics/LayoutRect.cpp
r164449 r168575 130 130 IntRect enclosingIntRect(const LayoutRect& rect) 131 131 { 132 // Empty rects with fractional x, y values turn into non-empty rects when converting to enclosing. 133 // We need to ensure that empty rects stay empty after the conversion, because the selection code expects them to be empty. 132 134 IntPoint location = flooredIntPoint(rect.minXMinYCorner()); 133 IntPoint maxPoint = ceiledIntPoint(rect.maxXMaxYCorner()); 134 135 IntPoint maxPoint = IntPoint(rect.width() ? rect.maxX().ceil() : location.x(), rect.height() ? rect.maxY().ceil() : location.y()); 135 136 return IntRect(location, maxPoint - location); 136 137 } -
trunk/Source/WebCore/rendering/InlineTextBox.cpp
r168528 r168575 266 266 } 267 267 268 // FIXME: remove this function, when switching to directional pixel snapping.269 static IntRect integralEnclosingRectForSelection(const LayoutRect& rect)270 {271 // Empty rects with fractional x, y values turn into non-empty rects when converting to enclosing.272 // We need to ensure that empty rects stay empty after the conversion, because the selection code expects them to be empty.273 IntPoint location = flooredIntPoint(rect.minXMinYCorner());274 IntPoint maxPoint = IntPoint(rect.width() ? rect.maxX().ceil() : location.x(), rect.height() ? rect.maxY().ceil() : location.y());275 return IntRect(location, maxPoint - location);276 }277 278 268 LayoutRect InlineTextBox::localSelectionRect(int startPos, int endPos) const 279 269 { … … 301 291 if (sPos || ePos != static_cast<int>(m_len)) 302 292 font.adjustSelectionRectForText(textRun, selectionRect, sPos, ePos); 303 IntRect snappedSelectionRect = integralEnclosingRectForSelection(selectionRect);293 IntRect snappedSelectionRect = enclosingIntRect(selectionRect); 304 294 LayoutUnit logicalWidth = snappedSelectionRect.width(); 305 295 if (snappedSelectionRect.x() > logicalRight()) … … 1189 1179 LayoutRect selectionRect = LayoutRect(startPoint, FloatSize(0, selHeight)); 1190 1180 font.adjustSelectionRectForText(run, selectionRect, startPosition, endPosition); 1191 IntRect markerRect = integralEnclosingRectForSelection(selectionRect);1181 IntRect markerRect = enclosingIntRect(selectionRect); 1192 1182 start = markerRect.x() - startPoint.x(); 1193 1183 width = markerRect.width(); … … 1234 1224 LayoutRect renderedRect = LayoutRect(LayoutPoint(x(), selectionTop()), FloatSize(0, selectionHeight)); 1235 1225 font.adjustSelectionRectForText(run, renderedRect, sPos, ePos); 1236 IntRect markerRect = integralEnclosingRectForSelection(renderedRect);1226 IntRect markerRect = enclosingIntRect(renderedRect); 1237 1227 markerRect = renderer().localToAbsoluteQuad(FloatQuad(markerRect)).enclosingBoundingBox(); 1238 1228 toRenderedDocumentMarker(marker)->setRenderedRect(markerRect); … … 1266 1256 LayoutRect selectionRect = LayoutRect(LayoutPoint(x(), top), LayoutSize(0, h)); 1267 1257 font.adjustSelectionRectForText(run, selectionRect, sPos, ePos); 1268 IntRect markerRect = integralEnclosingRectForSelection(selectionRect);1258 IntRect markerRect = enclosingIntRect(selectionRect); 1269 1259 markerRect = renderer().localToAbsoluteQuad(FloatRect(markerRect)).enclosingBoundingBox(); 1270 1260 toRenderedDocumentMarker(marker)->setRenderedRect(markerRect);
Note: See TracChangeset
for help on using the changeset viewer.