Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Side by Side Diff: LayoutTests/platform/mac/css1/formatting_model/height_of_lines-expected.txt

Issue 923953002: Move rendering/RenderImage* to layout/LayoutImage* (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2299 1 layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2299
2 RenderView at (0,0) size 800x600 2 RenderView at (0,0) size 800x600
3 layer at (0,0) size 785x2299 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 3 layer at (0,0) size 785x2299 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
4 RenderBlock {HTML} at (0,0) size 785x2299 4 RenderBlock {HTML} at (0,0) size 785x2299
5 RenderBody {BODY} at (8,8) size 769x2283 [bgcolor=#CCCCCC] 5 RenderBody {BODY} at (8,8) size 769x2283 [bgcolor=#CCCCCC]
6 RenderBlock {P} at (0,0) size 769x18 6 RenderBlock {P} at (0,0) size 769x18
7 RenderText {#text} at (0,0) size 363x18 7 RenderText {#text} at (0,0) size 363x18
8 text run at (0,0) width 363: "The style declarations which apply to th e text below are:" 8 text run at (0,0) width 363: "The style declarations which apply to th e text below are:"
9 RenderBlock {PRE} at (0,34) size 769x270 9 RenderBlock {PRE} at (0,34) size 769x270
10 RenderText {#text} at (0,0) size 523x270 10 RenderText {#text} at (0,0) size 523x270
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 text run at (312,240) width 1: " " 42 text run at (312,240) width 1: " "
43 text run at (0,255) width 0: " " 43 text run at (0,255) width 0: " "
44 RenderBlock {HR} at (0,317) size 769x2 [border: (1px inset #EEEEEE)] 44 RenderBlock {HR} at (0,317) size 769x2 [border: (1px inset #EEEEEE)]
45 RenderBlock {P} at (0,333) size 769x443 45 RenderBlock {P} at (0,333) size 769x443
46 RenderText {#text} at (0,1) size 768x239 46 RenderText {#text} at (0,1) size 768x239
47 text run at (0,1) width 413: "This paragraph should have a font size o f 14px and a line height of 20px. " 47 text run at (0,1) width 413: "This paragraph should have a font size o f 14px and a line height of 20px. "
48 text run at (412,1) width 345: "This means that the lines of text with in it should be separated" 48 text run at (412,1) width 345: "This means that the lines of text with in it should be separated"
49 text run at (0,21) width 367: "by six pixels, three of which are part of the line-box of each line. " 49 text run at (0,21) width 367: "by six pixels, three of which are part of the line-box of each line. "
50 text run at (366,21) width 402: "Any images within the paragraph shoul d increase the height of the line-" 50 text run at (366,21) width 402: "Any images within the paragraph shoul d increase the height of the line-"
51 text run at (0,223) width 266: "box so that they fit within the line b ox, such as " 51 text run at (0,223) width 266: "box so that they fit within the line b ox, such as "
52 RenderImage {IMG} at (265.17,40) size 200x200 52 LayoutImage {IMG} at (265.17,40) size 200x200
53 RenderText {#text} at (465,223) size 28x17 53 RenderText {#text} at (465,223) size 28x17
54 text run at (465,223) width 28: " and " 54 text run at (465,223) width 28: " and "
55 RenderImage {IMG} at (492.39,223) size 200x200 55 LayoutImage {IMG} at (492.39,223) size 200x200
56 RenderText {#text} at (692,223) size 769x218 56 RenderText {#text} at (692,223) size 769x218
57 text run at (692,223) width 8: ". " 57 text run at (692,223) width 8: ". "
58 text run at (699,223) width 39: "This is" 58 text run at (699,223) width 39: "This is"
59 text run at (0,424) width 769: "additional text to make sure that ther e is enough room left below the image so that this line does not hit the image t hat is text-top aligned." 59 text run at (0,424) width 769: "additional text to make sure that ther e is enough room left below the image so that this line does not hit the image t hat is text-top aligned."
60 RenderBlock {P} at (0,790) size 769x483 60 RenderBlock {P} at (0,790) size 769x483
61 RenderText {#text} at (0,1) size 759x199 61 RenderText {#text} at (0,1) size 759x199
62 text run at (0,1) width 413: "This paragraph should have a font size o f 14px and a line height of 20px. " 62 text run at (0,1) width 413: "This paragraph should have a font size o f 14px and a line height of 20px. "
63 text run at (412,1) width 345: "This means that the lines of text with in it should be separated" 63 text run at (412,1) width 345: "This means that the lines of text with in it should be separated"
64 text run at (0,21) width 78: "by six pixels. " 64 text run at (0,21) width 78: "by six pixels. "
65 text run at (77,21) width 682: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding ( 5px)," 65 text run at (77,21) width 682: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding ( 5px),"
66 text run at (0,183) width 351: "border (10px) and margins (15px) withi n the line box, such as " 66 text run at (0,183) width 351: "border (10px) and margins (15px) withi n the line box, such as "
67 RenderImage {IMG} at (365.70,55) size 130x130 [border: (10px solid #0000 00)] 67 LayoutImage {IMG} at (365.70,55) size 130x130 [border: (10px solid #0000 00)]
68 RenderText {#text} at (510,183) size 28x17 68 RenderText {#text} at (510,183) size 28x17
69 text run at (510,183) width 28: " and " 69 text run at (510,183) width 28: " and "
70 RenderImage {IMG} at (552.91,198) size 130x130 [border: (10px solid #000 000)] 70 LayoutImage {IMG} at (552.91,198) size 130x130 [border: (10px solid #000 000)]
71 RenderText {#text} at (697,183) size 769x257 71 RenderText {#text} at (697,183) size 769x257
72 text run at (697,183) width 8: ". " 72 text run at (697,183) width 8: ". "
73 text run at (704,183) width 39: "This is" 73 text run at (704,183) width 39: "This is"
74 text run at (0,344) width 769: "additional text to make sure that ther e is enough room left below the image so that this line does not hit the image t hat is text-top aligned." 74 text run at (0,344) width 769: "additional text to make sure that ther e is enough room left below the image so that this line does not hit the image t hat is text-top aligned."
75 text run at (0,364) width 735: "It is the outer edge of the margin tha t should be text-bottom and text-top aligned in this paragraph, so for the first image the bottom" 75 text run at (0,364) width 735: "It is the outer edge of the margin tha t should be text-bottom and text-top aligned in this paragraph, so for the first image the bottom"
76 text run at (0,384) width 753: "border of the image should begin 15px above the bottom of the text, and for the second image the top border should beg in 15px below" 76 text run at (0,384) width 753: "border of the image should begin 15px above the bottom of the text, and for the second image the top border should beg in 15px below"
77 text run at (0,423) width 103: "the top of the text " 77 text run at (0,423) width 103: "the top of the text "
78 RenderImage {IMG} at (92.25,393) size 80x80 [border: (10px solid #000000 )] 78 LayoutImage {IMG} at (92.25,393) size 80x80 [border: (10px solid #000000 )]
79 RenderText {#text} at (162,423) size 737x58 79 RenderText {#text} at (162,423) size 737x58
80 text run at (162,423) width 8: ". " 80 text run at (162,423) width 8: ". "
81 text run at (169,423) width 568: "The last image in this paragraph has -10px margins set on it, so that should pull the text in toward the" 81 text run at (169,423) width 568: "The last image in this paragraph has -10px margins set on it, so that should pull the text in toward the"
82 text run at (0,464) width 374: "image in the vertical direction, and a lso in the horizontal direction." 82 text run at (0,464) width 374: "image in the vertical direction, and a lso in the horizontal direction."
83 LayoutTable {TABLE} at (0,1287) size 769x996 [border: (1px outset #808080) ] 83 LayoutTable {TABLE} at (0,1287) size 769x996 [border: (1px outset #808080) ]
84 LayoutTableSection {TBODY} at (1,1) size 767x994 84 LayoutTableSection {TBODY} at (1,1) size 767x994
85 LayoutTableRow {TR} at (0,0) size 767x26 85 LayoutTableRow {TR} at (0,0) size 767x26
86 LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] 86 LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
87 RenderInline {STRONG} at (0,0) size 163x18 87 RenderInline {STRONG} at (0,0) size 163x18
88 RenderText {#text} at (4,4) size 163x18 88 RenderText {#text} at (4,4) size 163x18
89 text run at (4,4) width 163: "TABLE Testing Section" 89 text run at (4,4) width 163: "TABLE Testing Section"
90 LayoutTableRow {TR} at (0,26) size 767x968 90 LayoutTableRow {TR} at (0,26) size 767x968
91 LayoutTableCell {TD} at (0,497) size 12x26 [bgcolor=#C0C0C0] [border : (1px inset #808080)] [r=1 c=0 rs=1 cs=1] 91 LayoutTableCell {TD} at (0,497) size 12x26 [bgcolor=#C0C0C0] [border : (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
92 RenderText {#text} at (4,4) size 4x18 92 RenderText {#text} at (4,4) size 4x18
93 text run at (4,4) width 4: " " 93 text run at (4,4) width 4: " "
94 LayoutTableCell {TD} at (12,26) size 755x968 [border: (1px inset #80 8080)] [r=1 c=1 rs=1 cs=1] 94 LayoutTableCell {TD} at (12,26) size 755x968 [border: (1px inset #80 8080)] [r=1 c=1 rs=1 cs=1]
95 RenderBlock {P} at (4,4) size 747x463 95 RenderBlock {P} at (4,4) size 747x463
96 RenderText {#text} at (0,1) size 720x239 96 RenderText {#text} at (0,1) size 720x239
97 text run at (0,1) width 413: "This paragraph should have a fon t size of 14px and a line height of 20px. " 97 text run at (0,1) width 413: "This paragraph should have a fon t size of 14px and a line height of 20px. "
98 text run at (412,1) width 288: "This means that the lines of t ext within it should be" 98 text run at (412,1) width 288: "This means that the lines of t ext within it should be"
99 text run at (0,21) width 423: "separated by six pixels, three of which are part of the line-box of each line. " 99 text run at (0,21) width 423: "separated by six pixels, three of which are part of the line-box of each line. "
100 text run at (422,21) width 298: "Any images within the paragra ph should increase the" 100 text run at (422,21) width 298: "Any images within the paragra ph should increase the"
101 text run at (0,223) width 366: "height of the line-box so that they fit within the line box, such as " 101 text run at (0,223) width 366: "height of the line-box so that they fit within the line box, such as "
102 RenderImage {IMG} at (365.09,40) size 200x200 102 LayoutImage {IMG} at (365.09,40) size 200x200
103 RenderText {#text} at (565,223) size 28x17 103 RenderText {#text} at (565,223) size 28x17
104 text run at (565,223) width 28: " and " 104 text run at (565,223) width 28: " and "
105 RenderImage {IMG} at (0,243) size 200x200 105 LayoutImage {IMG} at (0,243) size 200x200
106 RenderText {#text} at (200,243) size 733x218 106 RenderText {#text} at (200,243) size 733x218
107 text run at (200,243) width 7: ". " 107 text run at (200,243) width 7: ". "
108 text run at (207,243) width 526: "This is additional text to m ake sure that there is enough room left below the image so that this" 108 text run at (207,243) width 526: "This is additional text to m ake sure that there is enough room left below the image so that this"
109 text run at (0,444) width 281: "line does not hit the image th at is text-top aligned." 109 text run at (0,444) width 281: "line does not hit the image th at is text-top aligned."
110 RenderBlock {P} at (4,481) size 747x483 110 RenderBlock {P} at (4,481) size 747x483
111 RenderText {#text} at (0,1) size 729x199 111 RenderText {#text} at (0,1) size 729x199
112 text run at (0,1) width 413: "This paragraph should have a fon t size of 14px and a line height of 20px. " 112 text run at (0,1) width 413: "This paragraph should have a fon t size of 14px and a line height of 20px. "
113 text run at (412,1) width 288: "This means that the lines of t ext within it should be" 113 text run at (412,1) width 288: "This means that the lines of t ext within it should be"
114 text run at (0,21) width 135: "separated by six pixels. " 114 text run at (0,21) width 135: "separated by six pixels. "
115 text run at (134,21) width 595: "Any images within the paragra ph should increase the height of the line-box so that they fit, including their" 115 text run at (134,21) width 595: "Any images within the paragra ph should increase the height of the line-box so that they fit, including their"
116 text run at (0,183) width 437: "padding (5px), border (10px) a nd margins (15px) within the line box, such as " 116 text run at (0,183) width 437: "padding (5px), border (10px) a nd margins (15px) within the line box, such as "
117 RenderImage {IMG} at (451.63,55) size 130x130 [border: (10px sol id #000000)] 117 LayoutImage {IMG} at (451.63,55) size 130x130 [border: (10px sol id #000000)]
118 RenderText {#text} at (596,183) size 28x17 118 RenderText {#text} at (596,183) size 28x17
119 text run at (596,183) width 28: " and " 119 text run at (596,183) width 28: " and "
120 RenderImage {IMG} at (15,218) size 130x130 [border: (10px solid #000000)] 120 LayoutImage {IMG} at (15,218) size 130x130 [border: (10px solid #000000)]
121 RenderText {#text} at (160,203) size 747x237 121 RenderText {#text} at (160,203) size 747x237
122 text run at (160,203) width 7: ". " 122 text run at (160,203) width 7: ". "
123 text run at (167,203) width 580: "This is additional text to m ake sure that there is enough room left below the image so that this line does" 123 text run at (167,203) width 580: "This is additional text to m ake sure that there is enough room left below the image so that this line does"
124 text run at (0,364) width 231: "not hit the image that is text -top aligned. " 124 text run at (0,364) width 231: "not hit the image that is text -top aligned. "
125 text run at (230,364) width 489: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this" 125 text run at (230,364) width 489: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this"
126 text run at (0,384) width 735: "paragraph, so for the first im age the bottom border of the image should begin 15px above the bottom of the tex t, and for the second" 126 text run at (0,384) width 735: "paragraph, so for the first im age the bottom border of the image should begin 15px above the bottom of the tex t, and for the second"
127 text run at (0,423) width 367: "image the top border should be gin 15px below the top of the text " 127 text run at (0,423) width 367: "image the top border should be gin 15px below the top of the text "
128 RenderImage {IMG} at (356.64,393) size 80x80 [border: (10px soli d #000000)] 128 LayoutImage {IMG} at (356.64,393) size 80x80 [border: (10px soli d #000000)]
129 RenderText {#text} at (426,423) size 740x58 129 RenderText {#text} at (426,423) size 740x58
130 text run at (426,423) width 8: ". " 130 text run at (426,423) width 8: ". "
131 text run at (433,423) width 307: "The last image in this parag raph has -10px margins set" 131 text run at (433,423) width 307: "The last image in this parag raph has -10px margins set"
132 text run at (0,464) width 635: "on it, so that should pull the text in toward the image in the vertical direction, and also in the horizontal direction." 132 text run at (0,464) width 635: "on it, so that should pull the text in toward the image in the vertical direction, and also in the horizontal direction."
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698