wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 827704: Fix 'visibility' animation so that it doesn't animate between values when one of them is not 'visibile'. r=bzbarsky

Browse Source
This commit is contained in:
L. David Baron 2013-01-08 20:37:29 -08:00
parent c9b4c7bd69
commit 585c1005ff
2 changed files with 85 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
layout/style/nsStyleAnimation.cpp
View File

@ -391,11 +391,17 @@ nsStyleAnimation::ComputeDistance(nsCSSProperty aProperty,
return false;
}
case eUnit_Visibility: {
int32_t startVal =
aStartValue.GetIntValue() == NS_STYLE_VISIBILITY_VISIBLE;
int32_t endVal =
aEndValue.GetIntValue() == NS_STYLE_VISIBILITY_VISIBLE;
aDistance = std::abs(startVal - endVal);
int32_t startEnum = aStartValue.GetIntValue();
int32_t endEnum = aEndValue.GetIntValue();
if (startEnum == endEnum) {
aDistance = 0;
return true;
}
if ((startEnum == NS_STYLE_VISIBILITY_VISIBLE) ==
(endEnum == NS_STYLE_VISIBILITY_VISIBLE)) {
return false;
}
aDistance = 1;
return true;
}
case eUnit_Integer: {
@ -1706,11 +1712,21 @@ nsStyleAnimation::AddWeighted(nsCSSProperty aProperty,
return false;
}
case eUnit_Visibility: {
int32_t val1 = aValue1.GetIntValue() == NS_STYLE_VISIBILITY_VISIBLE;
int32_t val2 = aValue2.GetIntValue() == NS_STYLE_VISIBILITY_VISIBLE;
int32_t enum1 = aValue1.GetIntValue();
int32_t enum2 = aValue2.GetIntValue();
if (enum1 == enum2) {
aResultValue.SetIntValue(enum1, eUnit_Visibility);
return true;
}
if ((enum1 == NS_STYLE_VISIBILITY_VISIBLE) ==
(enum2 == NS_STYLE_VISIBILITY_VISIBLE)) {
return false;
}
int32_t val1 = enum1 == NS_STYLE_VISIBILITY_VISIBLE;
int32_t val2 = enum2 == NS_STYLE_VISIBILITY_VISIBLE;
double interp = aCoeff1 * val1 + aCoeff2 * val2;
int32_t result = interp > 0.0 ? NS_STYLE_VISIBILITY_VISIBLE
: NS_STYLE_VISIBILITY_HIDDEN;
: (val1 ? enum2 : enum1);
aResultValue.SetIntValue(result, eUnit_Visibility);
return true;
}

85
layout/style/test/test_transitions_per_property.html
View File

@ -49,6 +49,7 @@ function any_unit_to_num(str)
}
var FUNC_NEGATIVE = "cubic-bezier(0.25, -2, 0.75, 1)";
var FUNC_OVERONE = "cubic-bezier(0.25, 0, 0.75, 3)";
var supported_properties = {
"border-bottom-left-radius": [ test_radius_transition ],
@ -1131,38 +1132,74 @@ function test_rect_transition(prop) {
}
function test_visibility_transition(prop) {
div.style.setProperty("transition-property", "none", "");
div.style.setProperty(prop, "visible", "");
is(cs.getPropertyValue(prop), "visible",
"visibility property " + prop + ": computed value before transition");
div.style.setProperty("transition-property", prop, "");
div.style.setProperty(prop, "hidden", "");
is(cs.getPropertyValue(prop), "visible",
"visibility property " + prop + ": interpolation of visibility");
function do_test(from_value, to_value, interp_value) {
div.style.setProperty("transition-property", "none", "");
div.style.setProperty(prop, from_value, "");
is(cs.getPropertyValue(prop), from_value,
"visibility property " + prop + ": computed value before transition");
div.style.setProperty("transition-property", prop, "");
div.style.setProperty(prop, to_value, "");
is(cs.getPropertyValue(prop), interp_value,
"visibility property " + prop + ": interpolation of visibility");
}
do_test("visible", "hidden", "visible");
do_test("hidden", "visible", "visible");
do_test("hidden", "collapse", "collapse"); /* not interpolable */
do_test("collapse", "hidden", "hidden"); /* not interpolable */
do_test("visible", "collapse", "visible");
do_test("collapse", "visible", "visible");
isnot(get_distance(prop, "visible", "hidden"), 0,
"distance between visible and hidden should not be zero");
isnot(get_distance(prop, "visible", "collapse"), 0,
"distance between visible and collapse should not be zero");
is(get_distance(prop, "visible", "visible"), 0,
"distance between visible and visible should not be zero");
is(get_distance(prop, "hidden", "hidden"), 0,
"distance between hidden and hidden should not be zero");
is(get_distance(prop, "collapse", "collapse"), 0,
"distance between collapse and collapse should not be zero");
div.style.setProperty("transition-timing-function", FUNC_NEGATIVE, "");
div.style.setProperty("transition-property", "none", "");
div.style.setProperty(prop, "visible", "");
is(cs.getPropertyValue(prop), "visible",
"visibility property " + prop + ": flush before clamping test");
div.style.setProperty("transition-property", prop, "");
div.style.setProperty(prop, "hidden", "");
is(cs.getPropertyValue(prop), "visible",
"visibility property " + prop + ": clamping of negatives");
div.style.setProperty("transition-property", "none", "");
div.style.setProperty(prop, "hidden", "");
is(cs.getPropertyValue(prop), "hidden",
"visibility property " + prop + ": flush before clamping test");
div.style.setProperty("transition-property", prop, "");
div.style.setProperty(prop, "visible", "");
is(cs.getPropertyValue(prop), "hidden",
"visibility property " + prop + ": clamping of negatives");
function do_negative_test(from_value, to_value, interpolable) {
div.style.setProperty("transition-property", "none", "");
div.style.setProperty(prop, from_value, "");
is(cs.getPropertyValue(prop), from_value,
"visibility property " + prop + ": flush before clamping test");
div.style.setProperty("transition-property", prop, "");
div.style.setProperty(prop, to_value, "");
is(cs.getPropertyValue(prop), interpolable ? from_value : to_value,
"visibility property " + prop + ": clamping of negatives");
}
do_negative_test("visible", "hidden", true);
do_negative_test("hidden", "visible", true);
do_negative_test("hidden", "collapse", false);
do_negative_test("collapse", "hidden", false);
do_negative_test("visible", "collapse", true);
do_negative_test("collapse", "visible", true);
div.style.setProperty("transition-delay", "-3s", "");
div.style.setProperty("transition-timing-function", FUNC_OVERONE, "");
function do_overone_test(from_value, to_value) {
div.style.setProperty("transition-property", "none", "");
div.style.setProperty(prop, from_value, "");
is(cs.getPropertyValue(prop), from_value,
"visibility property " + prop + ": flush before clamping test");
div.style.setProperty("transition-property", prop, "");
div.style.setProperty(prop, to_value, "");
is(cs.getPropertyValue(prop), to_value,
"visibility property " + prop + ": clamping of over-ones");
}
do_overone_test("visible", "hidden");
do_overone_test("hidden", "visible");
do_overone_test("hidden", "collapse");
do_overone_test("collapse", "hidden");
do_overone_test("visible", "collapse");
do_overone_test("collapse", "visible");
div.style.setProperty("transition-delay", "-1s", "");
div.style.setProperty("transition-timing-function", "linear", "");
}