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

Side by Side Diff: third_party/WebKit/LayoutTests/css3/flexbox/flexitem.html

Issue 2496663002: Merge css3/image/ and fast/images/ to images/ (Closed)
Patch Set: Address failing tests (3 of them) Created 4 years, 1 month 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 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html> 2 <html>
3 <link href="resources/flexbox.css" rel="stylesheet"> 3 <link href="resources/flexbox.css" rel="stylesheet">
4 <style> 4 <style>
5 .flexbox { 5 .flexbox {
6 width: 600px; 6 width: 600px;
7 background-color: #aaa; 7 background-color: #aaa;
8 position: relative; 8 position: relative;
9 min-height: 10px; 9 min-height: 10px;
10 } 10 }
(...skipping 28 matching lines...) Expand all
39 <input data-expected-display="block" data-expected-width="75" type="file" valu e="file"></input> 39 <input data-expected-display="block" data-expected-width="75" type="file" valu e="file"></input>
40 <input data-expected-display="block" data-expected-width="75" type="image" val ue="image"></input> 40 <input data-expected-display="block" data-expected-width="75" type="image" val ue="image"></input>
41 <input data-expected-display="block" data-expected-width="75" type="password" value="password"></input> 41 <input data-expected-display="block" data-expected-width="75" type="password" value="password"></input>
42 <input data-expected-display="block" data-expected-width="75" type="radio" val ue="radio"></input> 42 <input data-expected-display="block" data-expected-width="75" type="radio" val ue="radio"></input>
43 <input data-expected-display="block" data-expected-width="75" type="reset" val ue="reset"></input> 43 <input data-expected-display="block" data-expected-width="75" type="reset" val ue="reset"></input>
44 <input data-expected-display="block" data-expected-width="75" type="submit" va lue="submit"></input> 44 <input data-expected-display="block" data-expected-width="75" type="submit" va lue="submit"></input>
45 <input data-expected-display="block" data-expected-width="75" type="text" valu e="text"></input> 45 <input data-expected-display="block" data-expected-width="75" type="text" valu e="text"></input>
46 </div> 46 </div>
47 47
48 <div class="flexbox"> 48 <div class="flexbox">
49 <img data-expected-display="block" data-expected-width="200" style="flex: 1 0 auto;" src="../images/resources/blue-100.png"> 49 <img data-expected-display="block" data-expected-width="200" style="flex: 1 0 auto;" src="../../images/resources/blue-100.png">
50 <img data-expected-display="block" data-expected-width="200" data-expected-hei ght="100" style="flex: 2 0 0;" src="doesnotexist.png"> 50 <img data-expected-display="block" data-expected-width="200" data-expected-hei ght="100" style="flex: 2 0 0;" src="doesnotexist.png">
51 <img data-expected-display="block" data-expected-width="200" data-expected-hei ght="100" style="flex: 2 0 0;" src="doesnotexist.png" alt="placeholder text"> 51 <img data-expected-display="block" data-expected-width="200" data-expected-hei ght="100" style="flex: 2 0 0;" src="doesnotexist.png" alt="placeholder text">
52 </div> 52 </div>
53 53
54 <div class="flexbox"> 54 <div class="flexbox">
55 <svg data-expected-display="block" data-expected-bounding-client-rect-width="1 00" style="flex: 1 0 auto; width: 100px; height: 100px"> 55 <svg data-expected-display="block" data-expected-bounding-client-rect-width="1 00" style="flex: 1 0 auto; width: 100px; height: 100px">
56 <circle cx="50" cy="50" r="50" fill="blue"> 56 <circle cx="50" cy="50" r="50" fill="blue">
57 </circle> 57 </circle>
58 </svg> 58 </svg>
59 <svg data-expected-display="block" data-expected-bounding-client-rect-width="5 00" style="flex: 1 1 auto; height: 100px; width: 100%"> 59 <svg data-expected-display="block" data-expected-bounding-client-rect-width="5 00" style="flex: 1 1 auto; height: 100px; width: 100%">
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 <iframe seamless data-expected-display="block" data-expected-width="600" data- expected-height="30" style="height:30px" src="data:text/html,<body bgcolor=#fff> iframe</body>"></iframe> 105 <iframe seamless data-expected-display="block" data-expected-width="600" data- expected-height="30" style="height:30px" src="data:text/html,<body bgcolor=#fff> iframe</body>"></iframe>
106 <object data-expected-display="block" data-expected-width="600" data-expected- height="30">object</object> 106 <object data-expected-display="block" data-expected-width="600" data-expected- height="30">object</object>
107 <select data-expected-display="block" data-expected-width="600" data-expected- height="30"> 107 <select data-expected-display="block" data-expected-width="600" data-expected- height="30">
108 <option>select</option> 108 <option>select</option>
109 </select> 109 </select>
110 <textarea data-expected-display="block" data-expected-width="600" data-expecte d-height="30">textarea</textarea> 110 <textarea data-expected-display="block" data-expected-width="600" data-expecte d-height="30">textarea</textarea>
111 </div> 111 </div>
112 112
113 <!-- tests that min-height expands the height of flex items beyond the height of the flexbox --> 113 <!-- tests that min-height expands the height of flex items beyond the height of the flexbox -->
114 <div class="flexbox" style="height:50px"> 114 <div class="flexbox" style="height:50px">
115 <img data-expected-height="60" style="min-height:60px" src="../images/resour ces/blue-100.png"> 115 <img data-expected-height="60" style="min-height:60px" src="../../images/res ources/blue-100.png">
116 <img data-expected-height="60" style="min-height:60px" src="../images/resour ces/green-10.png"> 116 <img data-expected-height="60" style="min-height:60px" src="../../images/res ources/green-10.png">
117 <img data-expected-height="75" style="min-height:150%" src="../images/resour ces/blue-100.png"> 117 <img data-expected-height="75" style="min-height:150%" src="../../images/res ources/blue-100.png">
118 <img data-expected-height="75" style="min-height:150%" src="../images/resour ces/green-10.png"> 118 <img data-expected-height="75" style="min-height:150%" src="../../images/res ources/green-10.png">
119 <img data-expected-height="10" style="min-height:-webkit-min-content;height: 1px" src="../images/resources/blue-10.png"> 119 <img data-expected-height="10" style="min-height:-webkit-min-content;height: 1px" src="../../images/resources/blue-10.png">
120 <img data-expected-height="100" style="min-height:-webkit-max-content;height :1px" src="../images/resources/green-100.png"> 120 <img data-expected-height="100" style="min-height:-webkit-max-content;height :1px" src="../../images/resources/green-100.png">
121 <img data-expected-height="50" style="min-height:-webkit-fill-available" src ="../images/resources/blue-10.png"> 121 <img data-expected-height="50" style="min-height:-webkit-fill-available" src ="../../images/resources/blue-10.png">
122 <img data-expected-height="10" style="min-height:-webkit-fit-content;height: 1px" src="../images/resources/green-10.png"> 122 <img data-expected-height="10" style="min-height:-webkit-fit-content;height: 1px" src="../../images/resources/green-10.png">
123 </div> 123 </div>
124 124
125 <!-- tests that max-height shrinks the height of flex items less than the height of the flexbox --> 125 <!-- tests that max-height shrinks the height of flex items less than the height of the flexbox -->
126 <div class="flexbox" style="height:50px"> 126 <div class="flexbox" style="height:50px">
127 <img data-expected-height="40" style="max-height:40px" src="../images/resour ces/blue-100.png"> 127 <img data-expected-height="40" style="max-height:40px" src="../../images/res ources/blue-100.png">
128 <img data-expected-height="40" style="max-height:40px" src="../images/resour ces/green-10.png"> 128 <img data-expected-height="40" style="max-height:40px" src="../../images/res ources/green-10.png">
129 <img data-expected-height="25" style="max-height:50%" src="../images/resourc es/blue-100.png"> 129 <img data-expected-height="25" style="max-height:50%" src="../../images/reso urces/blue-100.png">
130 <img data-expected-height="25" style="max-height:50%" src="../images/resourc es/green-10.png"> 130 <img data-expected-height="25" style="max-height:50%" src="../../images/reso urces/green-10.png">
131 <img data-expected-height="10" style="max-height:-webkit-min-content;height: 1000px;" src="../images/resources/blue-10.png"> 131 <img data-expected-height="10" style="max-height:-webkit-min-content;height: 1000px;" src="../../images/resources/blue-10.png">
132 <img data-expected-height="100" style="max-height:-webkit-max-content;height :1000px;" src="../images/resources/green-100.png"> 132 <img data-expected-height="100" style="max-height:-webkit-max-content;height :1000px;" src="../../images/resources/green-100.png">
133 <img data-expected-height="50" style="max-height:-webkit-fill-available" src ="../images/resources/blue-100.png"> 133 <img data-expected-height="50" style="max-height:-webkit-fill-available" src ="../../images/resources/blue-100.png">
134 <img data-expected-height="10" style="max-height:-webkit-fit-content;height: 1000px" src="../images/resources/green-10.png"> 134 <img data-expected-height="10" style="max-height:-webkit-fit-content;height: 1000px" src="../../images/resources/green-10.png">
135 </div> 135 </div>
136 136
137 <!-- tests that images can shrink below their CSS height with min-height: min-co ntent --> 137 <!-- tests that images can shrink below their CSS height with min-height: min-co ntent -->
138 <div class="flexbox column" style="height:50px"> 138 <div class="flexbox column" style="height:50px">
139 <img data-expected-height="50" style="flex-shrink:1;height:1000px;min-height :-webkit-min-content;" src="../images/resources/blue-10.png"> 139 <img data-expected-height="50" style="flex-shrink:1;height:1000px;min-height :-webkit-min-content;" src="../../images/resources/blue-10.png">
140 </div> 140 </div>
141 141
142 <!-- tests that text can shrink below its CSS height with min-height: min-conten t --> 142 <!-- tests that text can shrink below its CSS height with min-height: min-conten t -->
143 <div class="flexbox column" style="height:50px"> 143 <div class="flexbox column" style="height:50px">
144 <div data-expected-height="50" style="flex-shrink:1;height:1000px;min-height :-webkit-min-content;" src="../images/resources/blue-10.png"> 144 <div data-expected-height="50" style="flex-shrink:1;height:1000px;min-height :-webkit-min-content;" src="../../images/resources/blue-10.png">
145 Some text<br> 145 Some text<br>
146 Some more text 146 Some more text
147 </div> 147 </div>
148 </div> 148 </div>
149 149
150 <!-- tests that images can shrink below their CSS width with min-width: min-cont ent --> 150 <!-- tests that images can shrink below their CSS width with min-width: min-cont ent -->
151 <div class="flexbox" style="width:50px"> 151 <div class="flexbox" style="width:50px">
152 <img data-expected-width="50" style="flex-shrink:1;width:1000px;min-width:-w ebkit-min-content;" src="../images/resources/blue-10.png"> 152 <img data-expected-width="50" style="flex-shrink:1;width:1000px;min-width:-w ebkit-min-content;" src="../../images/resources/blue-10.png">
153 </div> 153 </div>
154 154
155 <!-- tests that min-width expands the width of flex items beyond the width of th e flexbox --> 155 <!-- tests that min-width expands the width of flex items beyond the width of th e flexbox -->
156 <div class="flexbox column" style="width:50px"> 156 <div class="flexbox column" style="width:50px">
157 <img data-expected-width="60" style="min-width:60px" src="../images/resource s/blue-100.png"> 157 <img data-expected-width="60" style="min-width:60px" src="../../images/resou rces/blue-100.png">
158 <img data-expected-width="60" style="min-width:60px" src="../images/resource s/green-10.png"> 158 <img data-expected-width="60" style="min-width:60px" src="../../images/resou rces/green-10.png">
159 <img data-expected-width="75" style="min-width:150%" src="../images/resource s/blue-100.png"> 159 <img data-expected-width="75" style="min-width:150%" src="../../images/resou rces/blue-100.png">
160 <img data-expected-width="75" style="min-width:150%" src="../images/resource s/green-10.png"> 160 <img data-expected-width="75" style="min-width:150%" src="../../images/resou rces/green-10.png">
161 <img data-expected-width="100" style="min-width:-webkit-min-content" src=".. /images/resources/blue-100.png"> 161 <img data-expected-width="100" style="min-width:-webkit-min-content" src=".. /../images/resources/blue-100.png">
162 <img data-expected-width="50" style="min-width:-webkit-min-content" src="../ images/resources/green-10.png"> 162 <img data-expected-width="50" style="min-width:-webkit-min-content" src="../ ../images/resources/green-10.png">
163 <img data-expected-width="100" style="min-width:-webkit-max-content" src=".. /images/resources/blue-100.png"> 163 <img data-expected-width="100" style="min-width:-webkit-max-content" src=".. /../images/resources/blue-100.png">
164 <img data-expected-width="50" style="min-width:-webkit-max-content" src="../ images/resources/green-10.png"> 164 <img data-expected-width="50" style="min-width:-webkit-max-content" src="../ ../images/resources/green-10.png">
165 <img data-expected-width="50" style="min-width:-webkit-fill-available" src=" ../images/resources/blue-100.png"> 165 <img data-expected-width="50" style="min-width:-webkit-fill-available" src=" ../../images/resources/blue-100.png">
166 <img data-expected-width="50" style="min-width:-webkit-fill-available" src=" ../images/resources/green-10.png"> 166 <img data-expected-width="50" style="min-width:-webkit-fill-available" src=" ../../images/resources/green-10.png">
167 <img data-expected-width="100" style="min-width:-webkit-fit-content" src=".. /images/resources/blue-100.png"> 167 <img data-expected-width="100" style="min-width:-webkit-fit-content" src=".. /../images/resources/blue-100.png">
168 <img data-expected-width="50" style="min-width:-webkit-fit-content" src="../ images/resources/green-10.png"> 168 <img data-expected-width="50" style="min-width:-webkit-fit-content" src="../ ../images/resources/green-10.png">
169 </div> 169 </div>
170 170
171 <!-- tests that max-width shrinks the width of flex items less than the width of the flexbox --> 171 <!-- tests that max-width shrinks the width of flex items less than the width of the flexbox -->
172 <div class="flexbox column" style="width:50px"> 172 <div class="flexbox column" style="width:50px">
173 <img data-expected-width="40" style="max-width:40px" src="../images/resource s/blue-100.png"> 173 <img data-expected-width="40" style="max-width:40px" src="../../images/resou rces/blue-100.png">
174 <img data-expected-width="40" style="max-width:40px" src="../images/resource s/green-10.png"> 174 <img data-expected-width="40" style="max-width:40px" src="../../images/resou rces/green-10.png">
175 <img data-expected-width="25" style="max-width:50%" src="../images/resources /blue-100.png"> 175 <img data-expected-width="25" style="max-width:50%" src="../../images/resour ces/blue-100.png">
176 <img data-expected-width="25" style="max-width:50%" src="../images/resources /green-10.png"> 176 <img data-expected-width="25" style="max-width:50%" src="../../images/resour ces/green-10.png">
177 <img data-expected-width="50" style="max-width:-webkit-min-content" src="../ images/resources/blue-100.png"> 177 <img data-expected-width="50" style="max-width:-webkit-min-content" src="../ ../images/resources/blue-100.png">
178 <img data-expected-width="10" style="max-width:-webkit-min-content" src="../ images/resources/green-10.png"> 178 <img data-expected-width="10" style="max-width:-webkit-min-content" src="../ ../images/resources/green-10.png">
179 <img data-expected-width="50" style="max-width:-webkit-max-content" src="../ images/resources/blue-100.png"> 179 <img data-expected-width="50" style="max-width:-webkit-max-content" src="../ ../images/resources/blue-100.png">
180 <img data-expected-width="10" style="max-width:-webkit-max-content" src="../ images/resources/green-10.png"> 180 <img data-expected-width="10" style="max-width:-webkit-max-content" src="../ ../images/resources/green-10.png">
181 <img data-expected-width="50" style="max-width:-webkit-fill-available" src=" ../images/resources/blue-100.png"> 181 <img data-expected-width="50" style="max-width:-webkit-fill-available" src=" ../../images/resources/blue-100.png">
182 <img data-expected-width="50" style="max-width:-webkit-fill-available" src=" ../images/resources/green-10.png"> 182 <img data-expected-width="50" style="max-width:-webkit-fill-available" src=" ../../images/resources/green-10.png">
183 <img data-expected-width="50" style="max-width:-webkit-fit-content" src="../ images/resources/blue-100.png"> 183 <img data-expected-width="50" style="max-width:-webkit-fit-content" src="../ ../images/resources/blue-100.png">
184 <img data-expected-width="10" style="max-width:-webkit-fit-content" src="../ images/resources/green-10.png"> 184 <img data-expected-width="10" style="max-width:-webkit-fit-content" src="../ ../images/resources/green-10.png">
185 </div> 185 </div>
186 186
187 </html> 187 </html>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698