third_party/WebKit/LayoutTests/css3/flexbox/minimum-size-image.html - Issue 2496663002: Merge css3/image/ and fast/images/ to images/

Side by Side Diff: third_party/WebKit/LayoutTests/css3/flexbox/minimum-size-image.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:

« no previous file with comments | « third_party/WebKit/LayoutTests/css3/flexbox/flexitem-stretch-image.html ('k') | third_party/WebKit/LayoutTests/css3/flexbox/percent-height-children-of-alignSelf-stretch-flex-item.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2	2

3 <link href="resources/flexbox.css" rel="stylesheet">	3 <link href="resources/flexbox.css" rel="stylesheet">

4 <script src="../../resources/testharness.js"></script>	4 <script src="../../resources/testharness.js"></script>

5 <script src="../../resources/testharnessreport.js"></script>	5 <script src="../../resources/testharnessreport.js"></script>

6 <script src="../../resources/check-layout-th.js"></script>	6 <script src="../../resources/check-layout-th.js"></script>

7	7

8 <body onload="checkLayout('.flexbox')">	8 <body onload="checkLayout('.flexbox')">

9 <div id=log></div>	9 <div id=log></div>

10	10

11 <div class="flexbox" style="width: 10px;" data-expected-width="10">	11 <div class="flexbox" style="width: 10px;" data-expected-width="10">

12 <!-- should use content width, clamped by converted max-height, as minimum w idth. -->	12 <!-- should use content width, clamped by converted max-height, as minimum w idth. -->

13 <img src="../images/resources/green-100.png" style="max-height: 5px;"	13 <img src="../../images/resources/green-100.png" style="max-height: 5px;"

14 data-expected-width="5" data-expected-height="5">	14 data-expected-width="5" data-expected-height="5">

15 </div>	15 </div>

16	16

17 <div class="flexbox" style="width: 10px;" data-expected-width="10">	17 <div class="flexbox" style="width: 10px;" data-expected-width="10">

18 <!-- should use min(specified, content width) = 10px as minimum width,	18 <!-- should use min(specified, content width) = 10px as minimum width,

19 which the image will shrink to due to default flex-shrink. -->	19 which the image will shrink to due to default flex-shrink. -->

20 <img src="../images/resources/green-10.png" style="width: 100px;" data-expec ted-width="10">	20 <img src="../../images/resources/green-10.png" style="width: 100px;" data-ex pected-width="10">

21 </div>	21 </div>

22	22

23	23

24 <div class="flexbox" style="width: 10px;" data-expected-width="10">	24 <div class="flexbox" style="width: 10px;" data-expected-width="10">

25 <!-- should use content width, clamped by converted min-height, as minimum w idth. -->	25 <!-- should use content width, clamped by converted min-height, as minimum w idth. -->

26 <img src="../images/resources/green-100.png" style="max-height: 5px;"	26 <img src="../../images/resources/green-100.png" style="max-height: 5px;"

27 data-expected-width="5" data-expected-height="5">	27 data-expected-width="5" data-expected-height="5">

28 </div>	28 </div>

29	29

30 <div class="flexbox" style="width: 10px;" data-expected-width="10">	30 <div class="flexbox" style="width: 10px;" data-expected-width="10">

31 <!-- should use content width, clamped by converted min-height, as minimum w idth. -->	31 <!-- should use content width, clamped by converted min-height, as minimum w idth. -->

32 <img src="../images/resources/green-100.png" style="max-height: 5px; min-hei ght: 10px;"	32 <img src="../../images/resources/green-100.png" style="max-height: 5px; min- height: 10px;"

33 data-expected-width="10" data-expected-height="10">	33 data-expected-width="10" data-expected-height="10">

34 </div>	34 </div>

35	35

36 <div class="flexbox" style="width: 10px;" data-expected-width="10">	36 <div class="flexbox" style="width: 10px;" data-expected-width="10">

37 <!-- should use min(transferred, content width) = 10px as minimum width,	37 <!-- should use min(transferred, content width) = 10px as minimum width,

38 which the image will shrink to due to default flex-shrink. -->	38 which the image will shrink to due to default flex-shrink. -->

39 <img src="../images/resources/green-10.png" style="height: 100px;" data-expe cted-width="10">	39 <img src="../../images/resources/green-10.png" style="height: 100px;" data-e xpected-width="10">

40 </div>	40 </div>

41	41

42 <div class="flexbox column" style="height: 10px;" data-expected-height="10">	42 <div class="flexbox column" style="height: 10px;" data-expected-height="10">

43 <!-- should use content height, clamped by converted max-width, as minimum h eight. -->	43 <!-- should use content height, clamped by converted max-width, as minimum h eight. -->

44 <img src="../images/resources/green-100.png" style="max-width: 5px;"	44 <img src="../../images/resources/green-100.png" style="max-width: 5px;"

45 data-expected-width="5" data-expected-height="5">	45 data-expected-width="5" data-expected-height="5">

46 </div>	46 </div>

47	47

48 <div class="flexbox column" style="height: 10px;" data-expected-height="10">	48 <div class="flexbox column" style="height: 10px;" data-expected-height="10">

49 <!-- should use min(specified, content height) = 10px as minimum height,	49 <!-- should use min(specified, content height) = 10px as minimum height,

50 which the image will shrink to due to default flex-shrink. -->	50 which the image will shrink to due to default flex-shrink. -->

51 <img src="../images/resources/green-10.png" style="height: 100px;" data-expe cted-height="10">	51 <img src="../../images/resources/green-10.png" style="height: 100px;" data-e xpected-height="10">

52 </div>	52 </div>

53	53

54 <div class="flexbox" style="height: 10px;" data-expected-height="10">	54 <div class="flexbox" style="height: 10px;" data-expected-height="10">

55 <!-- should use content height, clamped by converted min-height, as minimum height. -->	55 <!-- should use content height, clamped by converted min-height, as minimum height. -->

56 <img src="../images/resources/green-100.png" style="max-height: 5px;"	56 <img src="../../images/resources/green-100.png" style="max-height: 5px;"

57 data-expected-height="5" data-expected-height="5">	57 data-expected-height="5" data-expected-height="5">

58 </div>	58 </div>

59	59

60 <div class="flexbox" style="height: 10px;" data-expected-height="10">	60 <div class="flexbox" style="height: 10px;" data-expected-height="10">

61 <!-- should use content height, clamped by converted min-width, as minimum h eight. -->	61 <!-- should use content height, clamped by converted min-width, as minimum h eight. -->

62 <img src="../images/resources/green-100.png" style="max-width: 5px; min-widt h: 10px;"	62 <img src="../../images/resources/green-100.png" style="max-width: 5px; min-w idth: 10px;"

63 data-expected-height="10" data-expected-width="10">	63 data-expected-height="10" data-expected-width="10">

64 </div>	64 </div>

65	65

66 <div class="flexbox column" style="height: 10px;" data-expected-height="10">	66 <div class="flexbox column" style="height: 10px;" data-expected-height="10">

67 <!-- should use min(transferred, content height) = 10px as minimum height,	67 <!-- should use min(transferred, content height) = 10px as minimum height,

68 which the image will shrink to due to default flex-shrink. -->	68 which the image will shrink to due to default flex-shrink. -->

69 <img src="../images/resources/green-10.png" style="width: 100px;" data-expec ted-height="10">	69 <img src="../../images/resources/green-10.png" style="width: 100px;" data-ex pected-height="10">

70 </div>	70 </div>

OLD	NEW