Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't put null coords in nsStyleCoords when they have the same meaning as some other coord type. b=379741 r+sr=bzbarsky

Browse Source
This commit is contained in:
dbaron@dbaron.org 2007-05-10 22:58:34 -07:00
parent d2b3b98c68
commit 39c21c098a
3 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/style/nsStyleStruct.cpp
View File

@ -222,7 +222,10 @@ static nscoord CalcCoord(const nsStyleCoord& aCoord,
}
nsStyleMargin::nsStyleMargin() {
mMargin.Reset();
nsStyleCoord zero(0);
NS_FOR_CSS_SIDES(side) {
mMargin.Set(side, zero);
}
mHasCachedMargin = PR_FALSE;
}
@ -277,7 +280,10 @@ nsChangeHint nsStyleMargin::MaxDifference()
#endif
nsStylePadding::nsStylePadding() {
mPadding.Reset();
nsStyleCoord zero(0);
NS_FOR_CSS_SIDES(side) {
mPadding.Set(side, zero);
}
mHasCachedPadding = PR_FALSE;
}
@ -1301,6 +1307,7 @@ nsStyleContent::nsStyleContent(void)
mResetCount(0),
mResets(nsnull)
{
mMarkerOffset.SetAutoValue();
}
nsStyleContent::~nsStyleContent(void)

1
layout/style/test/Makefile.in
View File

@ -73,6 +73,7 @@ _TEST_FILES = test_bug221428.html \
test_bug372770.html \
test_bug373293.html \
test_bug379440.html \
test_bug379741.html \
test_inherit_storage.html \
test_inherit_computation.html \
test_initial_storage.html \

46
layout/style/test/test_bug379741.html Normal file
View File

@ -0,0 +1,46 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=379741
-->
<head>
<title>Test for Bug 379741</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=379741">Mozilla Bug 379741</a>
<div id="content" style="display: none">
<div id="noframe"></div>
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
/** Test for Bug 379741 **/
var cs = getComputedStyle(document.getElementById("noframe"), "");
ok(cs.marginTop == "0" || cs.marginTop == "0px",
"computed margin-top is not none");
ok(cs.marginRight == "0" || cs.marginRight == "0px",
"computed margin-right is not none");
ok(cs.marginBottom == "0" || cs.marginBottom == "0px",
"computed margin-bottom is not none");
ok(cs.marginLeft == "0" || cs.marginLeft == "0px",
"computed margin-left is not none");
ok(cs.paddingTop == "0" || cs.paddingTop == "0px",
"computed padding-top is not none");
ok(cs.paddingRight == "0" || cs.paddingRight == "0px",
"computed padding-right is not none");
ok(cs.paddingBottom == "0" || cs.paddingBottom == "0px",
"computed padding-bottom is not none");
ok(cs.paddingLeft == "0" || cs.paddingLeft == "0px",
"computed padding-left is not none");
ok(cs.markerOffset == "auto",
"computed marker-offset is not none");
</script>
</pre>
</body>
</html>