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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/css3/filters/filter-repaint-feimage.html ('k') | third_party/WebKit/LayoutTests/css3/flexbox/flexitem-stretch-image.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/css3/flexbox/flexitem.html
diff --git a/third_party/WebKit/LayoutTests/css3/flexbox/flexitem.html b/third_party/WebKit/LayoutTests/css3/flexbox/flexitem.html
index 33b96ef27078974e24b34afdee68a15597ac17d6..f996cba686032e6fbe3c98c8ce59a260d9e6a0ee 100644
--- a/third_party/WebKit/LayoutTests/css3/flexbox/flexitem.html
+++ b/third_party/WebKit/LayoutTests/css3/flexbox/flexitem.html
@@ -46,7 +46,7 @@
</div>
<div class="flexbox">
- <img data-expected-display="block" data-expected-width="200" style="flex: 1 0 auto;" src="../images/resources/blue-100.png">
+ <img data-expected-display="block" data-expected-width="200" style="flex: 1 0 auto;" src="../../images/resources/blue-100.png">
<img data-expected-display="block" data-expected-width="200" data-expected-height="100" style="flex: 2 0 0;" src="doesnotexist.png">
<img data-expected-display="block" data-expected-width="200" data-expected-height="100" style="flex: 2 0 0;" src="doesnotexist.png" alt="placeholder text">
</div>
@@ -112,36 +112,36 @@
<!-- tests that min-height expands the height of flex items beyond the height of the flexbox -->
<div class="flexbox" style="height:50px">
- <img data-expected-height="60" style="min-height:60px" src="../images/resources/blue-100.png">
- <img data-expected-height="60" style="min-height:60px" src="../images/resources/green-10.png">
- <img data-expected-height="75" style="min-height:150%" src="../images/resources/blue-100.png">
- <img data-expected-height="75" style="min-height:150%" src="../images/resources/green-10.png">
- <img data-expected-height="10" style="min-height:-webkit-min-content;height:1px" src="../images/resources/blue-10.png">
- <img data-expected-height="100" style="min-height:-webkit-max-content;height:1px" src="../images/resources/green-100.png">
- <img data-expected-height="50" style="min-height:-webkit-fill-available" src="../images/resources/blue-10.png">
- <img data-expected-height="10" style="min-height:-webkit-fit-content;height:1px" src="../images/resources/green-10.png">
+ <img data-expected-height="60" style="min-height:60px" src="../../images/resources/blue-100.png">
+ <img data-expected-height="60" style="min-height:60px" src="../../images/resources/green-10.png">
+ <img data-expected-height="75" style="min-height:150%" src="../../images/resources/blue-100.png">
+ <img data-expected-height="75" style="min-height:150%" src="../../images/resources/green-10.png">
+ <img data-expected-height="10" style="min-height:-webkit-min-content;height:1px" src="../../images/resources/blue-10.png">
+ <img data-expected-height="100" style="min-height:-webkit-max-content;height:1px" src="../../images/resources/green-100.png">
+ <img data-expected-height="50" style="min-height:-webkit-fill-available" src="../../images/resources/blue-10.png">
+ <img data-expected-height="10" style="min-height:-webkit-fit-content;height:1px" src="../../images/resources/green-10.png">
</div>
<!-- tests that max-height shrinks the height of flex items less than the height of the flexbox -->
<div class="flexbox" style="height:50px">
- <img data-expected-height="40" style="max-height:40px" src="../images/resources/blue-100.png">
- <img data-expected-height="40" style="max-height:40px" src="../images/resources/green-10.png">
- <img data-expected-height="25" style="max-height:50%" src="../images/resources/blue-100.png">
- <img data-expected-height="25" style="max-height:50%" src="../images/resources/green-10.png">
- <img data-expected-height="10" style="max-height:-webkit-min-content;height:1000px;" src="../images/resources/blue-10.png">
- <img data-expected-height="100" style="max-height:-webkit-max-content;height:1000px;" src="../images/resources/green-100.png">
- <img data-expected-height="50" style="max-height:-webkit-fill-available" src="../images/resources/blue-100.png">
- <img data-expected-height="10" style="max-height:-webkit-fit-content;height:1000px" src="../images/resources/green-10.png">
+ <img data-expected-height="40" style="max-height:40px" src="../../images/resources/blue-100.png">
+ <img data-expected-height="40" style="max-height:40px" src="../../images/resources/green-10.png">
+ <img data-expected-height="25" style="max-height:50%" src="../../images/resources/blue-100.png">
+ <img data-expected-height="25" style="max-height:50%" src="../../images/resources/green-10.png">
+ <img data-expected-height="10" style="max-height:-webkit-min-content;height:1000px;" src="../../images/resources/blue-10.png">
+ <img data-expected-height="100" style="max-height:-webkit-max-content;height:1000px;" src="../../images/resources/green-100.png">
+ <img data-expected-height="50" style="max-height:-webkit-fill-available" src="../../images/resources/blue-100.png">
+ <img data-expected-height="10" style="max-height:-webkit-fit-content;height:1000px" src="../../images/resources/green-10.png">
</div>
<!-- tests that images can shrink below their CSS height with min-height: min-content -->
<div class="flexbox column" style="height:50px">
- <img data-expected-height="50" style="flex-shrink:1;height:1000px;min-height:-webkit-min-content;" src="../images/resources/blue-10.png">
+ <img data-expected-height="50" style="flex-shrink:1;height:1000px;min-height:-webkit-min-content;" src="../../images/resources/blue-10.png">
</div>
<!-- tests that text can shrink below its CSS height with min-height: min-content -->
<div class="flexbox column" style="height:50px">
- <div data-expected-height="50" style="flex-shrink:1;height:1000px;min-height:-webkit-min-content;" src="../images/resources/blue-10.png">
+ <div data-expected-height="50" style="flex-shrink:1;height:1000px;min-height:-webkit-min-content;" src="../../images/resources/blue-10.png">
Some text<br>
Some more text
</div>
@@ -149,39 +149,39 @@
<!-- tests that images can shrink below their CSS width with min-width: min-content -->
<div class="flexbox" style="width:50px">
- <img data-expected-width="50" style="flex-shrink:1;width:1000px;min-width:-webkit-min-content;" src="../images/resources/blue-10.png">
+ <img data-expected-width="50" style="flex-shrink:1;width:1000px;min-width:-webkit-min-content;" src="../../images/resources/blue-10.png">
</div>
<!-- tests that min-width expands the width of flex items beyond the width of the flexbox -->
<div class="flexbox column" style="width:50px">
- <img data-expected-width="60" style="min-width:60px" src="../images/resources/blue-100.png">
- <img data-expected-width="60" style="min-width:60px" src="../images/resources/green-10.png">
- <img data-expected-width="75" style="min-width:150%" src="../images/resources/blue-100.png">
- <img data-expected-width="75" style="min-width:150%" src="../images/resources/green-10.png">
- <img data-expected-width="100" style="min-width:-webkit-min-content" src="../images/resources/blue-100.png">
- <img data-expected-width="50" style="min-width:-webkit-min-content" src="../images/resources/green-10.png">
- <img data-expected-width="100" style="min-width:-webkit-max-content" src="../images/resources/blue-100.png">
- <img data-expected-width="50" style="min-width:-webkit-max-content" src="../images/resources/green-10.png">
- <img data-expected-width="50" style="min-width:-webkit-fill-available" src="../images/resources/blue-100.png">
- <img data-expected-width="50" style="min-width:-webkit-fill-available" src="../images/resources/green-10.png">
- <img data-expected-width="100" style="min-width:-webkit-fit-content" src="../images/resources/blue-100.png">
- <img data-expected-width="50" style="min-width:-webkit-fit-content" src="../images/resources/green-10.png">
+ <img data-expected-width="60" style="min-width:60px" src="../../images/resources/blue-100.png">
+ <img data-expected-width="60" style="min-width:60px" src="../../images/resources/green-10.png">
+ <img data-expected-width="75" style="min-width:150%" src="../../images/resources/blue-100.png">
+ <img data-expected-width="75" style="min-width:150%" src="../../images/resources/green-10.png">
+ <img data-expected-width="100" style="min-width:-webkit-min-content" src="../../images/resources/blue-100.png">
+ <img data-expected-width="50" style="min-width:-webkit-min-content" src="../../images/resources/green-10.png">
+ <img data-expected-width="100" style="min-width:-webkit-max-content" src="../../images/resources/blue-100.png">
+ <img data-expected-width="50" style="min-width:-webkit-max-content" src="../../images/resources/green-10.png">
+ <img data-expected-width="50" style="min-width:-webkit-fill-available" src="../../images/resources/blue-100.png">
+ <img data-expected-width="50" style="min-width:-webkit-fill-available" src="../../images/resources/green-10.png">
+ <img data-expected-width="100" style="min-width:-webkit-fit-content" src="../../images/resources/blue-100.png">
+ <img data-expected-width="50" style="min-width:-webkit-fit-content" src="../../images/resources/green-10.png">
</div>
<!-- tests that max-width shrinks the width of flex items less than the width of the flexbox -->
<div class="flexbox column" style="width:50px">
- <img data-expected-width="40" style="max-width:40px" src="../images/resources/blue-100.png">
- <img data-expected-width="40" style="max-width:40px" src="../images/resources/green-10.png">
- <img data-expected-width="25" style="max-width:50%" src="../images/resources/blue-100.png">
- <img data-expected-width="25" style="max-width:50%" src="../images/resources/green-10.png">
- <img data-expected-width="50" style="max-width:-webkit-min-content" src="../images/resources/blue-100.png">
- <img data-expected-width="10" style="max-width:-webkit-min-content" src="../images/resources/green-10.png">
- <img data-expected-width="50" style="max-width:-webkit-max-content" src="../images/resources/blue-100.png">
- <img data-expected-width="10" style="max-width:-webkit-max-content" src="../images/resources/green-10.png">
- <img data-expected-width="50" style="max-width:-webkit-fill-available" src="../images/resources/blue-100.png">
- <img data-expected-width="50" style="max-width:-webkit-fill-available" src="../images/resources/green-10.png">
- <img data-expected-width="50" style="max-width:-webkit-fit-content" src="../images/resources/blue-100.png">
- <img data-expected-width="10" style="max-width:-webkit-fit-content" src="../images/resources/green-10.png">
+ <img data-expected-width="40" style="max-width:40px" src="../../images/resources/blue-100.png">
+ <img data-expected-width="40" style="max-width:40px" src="../../images/resources/green-10.png">
+ <img data-expected-width="25" style="max-width:50%" src="../../images/resources/blue-100.png">
+ <img data-expected-width="25" style="max-width:50%" src="../../images/resources/green-10.png">
+ <img data-expected-width="50" style="max-width:-webkit-min-content" src="../../images/resources/blue-100.png">
+ <img data-expected-width="10" style="max-width:-webkit-min-content" src="../../images/resources/green-10.png">
+ <img data-expected-width="50" style="max-width:-webkit-max-content" src="../../images/resources/blue-100.png">
+ <img data-expected-width="10" style="max-width:-webkit-max-content" src="../../images/resources/green-10.png">
+ <img data-expected-width="50" style="max-width:-webkit-fill-available" src="../../images/resources/blue-100.png">
+ <img data-expected-width="50" style="max-width:-webkit-fill-available" src="../../images/resources/green-10.png">
+ <img data-expected-width="50" style="max-width:-webkit-fit-content" src="../../images/resources/blue-100.png">
+ <img data-expected-width="10" style="max-width:-webkit-fit-content" src="../../images/resources/green-10.png">
</div>
</html>
« no previous file with comments | « third_party/WebKit/LayoutTests/css3/filters/filter-repaint-feimage.html ('k') | third_party/WebKit/LayoutTests/css3/flexbox/flexitem-stretch-image.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698