From c43f5c933ca889ad14fbfaffaf2a309dd1b03ffd Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Fri, 22 Apr 2016 12:01:16 +1000 Subject: [PATCH] Bug 1260543 followup - Fix the function name in test_transitions_per_property.html. DONTBUILD MozReview-Commit-ID: CKUpbBhN2KT --HG-- extra : source : f2327d92b118737c4294ae61bd6d10631f0671ef --- .../test/test_transitions_per_property.html | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/layout/style/test/test_transitions_per_property.html b/layout/style/test/test_transitions_per_property.html index ac1135297ecf..e1ebfd42641f 100644 --- a/layout/style/test/test_transitions_per_property.html +++ b/layout/style/test/test_transitions_per_property.html @@ -71,7 +71,7 @@ var supported_properties = { test_integer_at_least_one_clamping ], "-moz-column-gap": [ test_length_transition, test_length_clamped ], - "-moz-column-rule-color": [ test_general_color_transition, + "-moz-column-rule-color": [ test_color_transition, test_currentcolor_transition, test_border_color_transition ], "-moz-column-rule-width": [ test_length_transition, @@ -83,7 +83,7 @@ var supported_properties = { "-moz-outline-radius-bottomright": [ test_radius_transition ], "-moz-outline-radius-topleft": [ test_radius_transition ], "-moz-outline-radius-topright": [ test_radius_transition ], - "background-color": [ test_general_color_transition, + "background-color": [ test_color_transition, test_currentcolor_transition ], "background-position": [ test_background_position_transition, // FIXME: We don't currently test clamping, @@ -95,24 +95,24 @@ var supported_properties = { // since background-size uses calc() as an // intermediate form. /* test_length_percent_pair_clamped */ ], - "border-bottom-color": [ test_general_color_transition, + "border-bottom-color": [ test_color_transition, test_currentcolor_transition, test_border_color_transition ], "border-bottom-width": [ test_length_transition, test_length_clamped ], - "border-left-color": [ test_general_color_transition, + "border-left-color": [ test_color_transition, test_currentcolor_transition, test_border_color_transition ], "border-left-width": [ test_length_transition, test_length_clamped ], - "border-right-color": [ test_general_color_transition, + "border-right-color": [ test_color_transition, test_currentcolor_transition, test_border_color_transition ], "border-right-width": [ test_length_transition, test_length_clamped ], "border-spacing": [ test_length_pair_transition, test_length_pair_transition_clamped ], - "border-top-color": [ test_general_color_transition, + "border-top-color": [ test_color_transition, test_currentcolor_transition, test_border_color_transition ], "border-top-width": [ test_length_transition, @@ -122,9 +122,9 @@ var supported_properties = { test_length_unclamped, test_percent_unclamped ], "clip": [ test_rect_transition ], "clip-path": [ test_clip_path_transition ], - "color": [ test_general_color_transition, + "color": [ test_color_transition, test_currentcolor_transition ], - "fill": [ test_general_color_transition, + "fill": [ test_color_transition, test_currentcolor_transition ], "fill-opacity" : [ test_float_zeroToOne_transition, // opacity is clamped in computed style @@ -137,7 +137,7 @@ var supported_properties = { test_float_aboveOne_transition ], "flex-shrink": [ test_float_zeroToOne_transition, test_float_aboveOne_transition ], - "flood-color": [ test_general_color_transition, + "flood-color": [ test_color_transition, test_currentcolor_transition ], "flood-opacity" : [ test_float_zeroToOne_transition, // opacity is clamped in computed style @@ -161,7 +161,7 @@ var supported_properties = { test_length_percent_calc_transition, test_length_unclamped, test_percent_unclamped ], "letter-spacing": [ test_length_transition, test_length_unclamped ], - "lighting-color": [ test_general_color_transition, + "lighting-color": [ test_color_transition, test_currentcolor_transition ], // NOTE: when calc() is supported on 'line-height', we should add // test_length_percent_calc_transition. @@ -199,7 +199,7 @@ var supported_properties = { // (not parsing/interpolation) test_float_zeroToOne_clamped ], "order": [ test_integer_transition ], - "outline-color": [ test_general_color_transition, + "outline-color": [ test_color_transition, test_currentcolor_transition ], "outline-offset": [ test_length_transition, test_length_unclamped ], "outline-width": [ test_length_transition, test_length_clamped ], @@ -222,13 +222,13 @@ var supported_properties = { "right": [ test_length_transition, test_percent_transition, test_length_percent_calc_transition, test_length_unclamped, test_percent_unclamped ], - "stop-color": [ test_general_color_transition, + "stop-color": [ test_color_transition, test_currentcolor_transition ], "stop-opacity" : [ test_float_zeroToOne_transition, // opacity is clamped in computed style // (not parsing/interpolation) test_float_zeroToOne_clamped ], - "stroke": [ test_general_color_transition, + "stroke": [ test_color_transition, test_currentcolor_transition ], "stroke-dasharray": [ test_dasharray_transition ], // NOTE: when calc() is supported on 'stroke-dashoffset', we should @@ -245,13 +245,13 @@ var supported_properties = { // test_length_percent_calc_transition. "stroke-width": [ test_length_transition_svg, test_percent_transition, test_length_clamped_svg, test_percent_clamped ], - "text-decoration": [ test_general_color_shorthand_transition, + "text-decoration": [ test_color_shorthand_transition, test_currentcolor_shorthand_transition, test_border_color_shorthand_transition ], - "text-decoration-color": [ test_general_color_transition, + "text-decoration-color": [ test_color_transition, test_currentcolor_transition, test_border_color_transition ], - "text-emphasis-color": [ test_general_color_transition ], + "text-emphasis-color": [ test_color_transition ], "text-indent": [ test_length_transition, test_percent_transition, test_length_percent_calc_transition, test_length_unclamped, test_percent_unclamped ], @@ -272,7 +272,7 @@ var supported_properties = { test_length_clamped, test_percent_clamped ], "word-spacing": [ test_length_transition, test_length_unclamped ], "z-index": [ test_integer_transition, test_pos_integer_or_auto_transition ], - "-webkit-text-fill-color": [ test_general_color_transition ] + "-webkit-text-fill-color": [ test_color_transition ] }; if (SupportsMaskShorthand()) { @@ -1238,7 +1238,7 @@ function test_length_percent_calc_transition(prop) { "calc(50% + 50px)"); } -function test_general_color_transition(prop, get_color=(x => x), is_shorthand=false) { +function test_color_transition(prop, get_color=(x => x), is_shorthand=false) { div.style.setProperty("transition-property", "none", ""); div.style.setProperty(prop, "rgb(255, 28, 0)", ""); is(get_color(cs.getPropertyValue(prop)), "rgb(255, 28, 0)", @@ -1324,8 +1324,8 @@ function get_color_from_shorthand_value(value) { return m[0]; } -function test_general_color_shorthand_transition(prop) { - test_general_color_transition(prop, get_color_from_shorthand_value, true); +function test_color_shorthand_transition(prop) { + test_color_transition(prop, get_color_from_shorthand_value, true); } function test_currentcolor_shorthand_transition(prop) {