Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement min-width and max-width for non-block flows.
+ Add simple reftests. + Add reftests for float min-width and max-width.
- Loading branch information
Showing
12 changed files
with
292 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<html> | ||
<head> | ||
<style> | ||
#first { | ||
width: 100px; | ||
height: 100px; | ||
border: solid 1px; | ||
} | ||
#float { | ||
float: left; | ||
height: 50px; | ||
width: 50px; | ||
max-width: 40px; | ||
background: green; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<div id="first"> | ||
<div id="float"> | ||
</div> | ||
</div> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
<html> | ||
<head> | ||
<style> | ||
#first { | ||
width: 100px; | ||
height: 100px; | ||
border: solid 1px; | ||
} | ||
#block { | ||
height: 50px; | ||
width: 40px; | ||
background: green; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<div id="first"> | ||
<div id="block"> | ||
</div> | ||
</div> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<html> | ||
<head> | ||
<style> | ||
#first { | ||
position: relative; | ||
width: 100px; | ||
height: 100px; | ||
border: solid 1px; | ||
} | ||
#block { | ||
height: 50px; | ||
width: 50%; | ||
max-width: 40px; | ||
background: green; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<div id="first"> | ||
<div id="block"> | ||
</div> | ||
</div> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
<html> | ||
<head> | ||
<style> | ||
#first { | ||
width: 100px; | ||
height: 100px; | ||
border: solid 1px; | ||
} | ||
#block { | ||
height: 50px; | ||
width: 40px; | ||
background: green; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<div id="first"> | ||
<div id="block"> | ||
</div> | ||
</div> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
<html> | ||
<head> | ||
<style> | ||
#first { | ||
position: relative; | ||
width: 100px; | ||
height: 100px; | ||
border: solid 1px; | ||
} | ||
#float { | ||
float: left; | ||
height: 50px; | ||
width: 50%; | ||
min-width: 60px; | ||
background: green; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<div id="first"> | ||
<div id="float"> | ||
</div> | ||
</div> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
<html> | ||
<head> | ||
<style> | ||
#first { | ||
width: 100px; | ||
height: 100px; | ||
border: solid 1px; | ||
} | ||
#block { | ||
height: 50px; | ||
width: 60px; | ||
background: green; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<div id="first"> | ||
<div id="block"> | ||
</div> | ||
</div> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<html> | ||
<head> | ||
<style> | ||
#first { | ||
position: relative; | ||
width: 100px; | ||
height: 100px; | ||
border: solid 1px; | ||
} | ||
#block { | ||
height: 50px; | ||
width: 50%; | ||
min-width: 60px; | ||
background: green; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<div id="first"> | ||
<div id="block"> | ||
</div> | ||
</div> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
<html> | ||
<head> | ||
<style> | ||
#first { | ||
width: 100px; | ||
height: 100px; | ||
border: solid 1px; | ||
} | ||
#block { | ||
height: 50px; | ||
width: 60px; | ||
background: green; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<div id="first"> | ||
<div id="block"> | ||
</div> | ||
</div> | ||
</body> | ||
</html> |
Oops, something went wrong.
9d510a7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from pcwalton
at pradeep90@9d510a7
9d510a7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging pradeep90/servo/calculate-width-trait = 9d510a7 into auto
9d510a7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pradeep90/servo/calculate-width-trait = 9d510a7 merged ok, testing candidate = f1a6ab6
9d510a7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some tests failed:
exception: http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/1018
9d510a7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from pcwalton
at pradeep90@9d510a7
9d510a7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging pradeep90/servo/calculate-width-trait = 9d510a7 into auto
9d510a7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pradeep90/servo/calculate-width-trait = 9d510a7 merged ok, testing candidate = 9d5567b
9d510a7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/1064
success: http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/1019
9d510a7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 9d5567b