зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 9 changesets (bug 1353689) for web platform reftest failures
Backed out changeset 80ac3ea1427e (bug 1353689) Backed out changeset 9a5b36fefb22 (bug 1353689) Backed out changeset 44c5f4b4cdfc (bug 1353689) Backed out changeset 7f2790b4c963 (bug 1353689) Backed out changeset 8d8d2824a763 (bug 1353689) Backed out changeset d3ced5751998 (bug 1353689) Backed out changeset 5179ebf1e982 (bug 1353689) Backed out changeset ebf24732e9b3 (bug 1353689) Backed out changeset e81924e4cff3 (bug 1353689)
This commit is contained in:
Iris Hsiao
Родитель
d457e48592
Коммит
7aacf33d10
|
|
@ -522,7 +522,6 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
|
|||
styles = {
|
||||
position: "absolute",
|
||||
textAlign: cue.align,
|
||||
font: styleOptions.font,
|
||||
};
|
||||
|
||||
this.div = window.document.createElement("div");
|
||||
|
|
@ -533,24 +532,17 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
|
|||
// Calculate the distance from the reference edge of the viewport to the text
|
||||
// position of the cue box. The reference edge will be resolved later when
|
||||
// the box orientation styles are applied.
|
||||
function convertCuePostionToPercentage(cuePosition) {
|
||||
if (cuePosition === "auto") {
|
||||
return 50;
|
||||
}
|
||||
return cuePosition;
|
||||
}
|
||||
var textPos = 0;
|
||||
let postionPercentage = convertCuePostionToPercentage(cue.position);
|
||||
switch (cue.computedPositionAlign) {
|
||||
// TODO : modify these fomula to follow the spec, see bug 1277437.
|
||||
case "line-left":
|
||||
textPos = postionPercentage;
|
||||
textPos = cue.position;
|
||||
break;
|
||||
case "center":
|
||||
textPos = postionPercentage - (cue.size / 2);
|
||||
textPos = cue.position - (cue.size / 2);
|
||||
break;
|
||||
case "line-right":
|
||||
textPos = postionPercentage - cue.size;
|
||||
textPos = cue.position - cue.size;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -901,6 +893,7 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
|
|||
|
||||
var FONT_SIZE_PERCENT = 0.05;
|
||||
var FONT_STYLE = "sans-serif";
|
||||
var CUE_BACKGROUND_PADDING = "1.5%";
|
||||
|
||||
// Runs the processing model over the cues and regions passed to it.
|
||||
// @param overlay A block level element (usually a div) that the computed cues
|
||||
|
|
@ -926,13 +919,14 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
|
|||
controlBarShown = controlBar ? !!controlBar.clientHeight : false;
|
||||
}
|
||||
|
||||
var rootOfCues = window.document.createElement("div");
|
||||
rootOfCues.style.position = "absolute";
|
||||
rootOfCues.style.left = "0";
|
||||
rootOfCues.style.right = "0";
|
||||
rootOfCues.style.top = "0";
|
||||
rootOfCues.style.bottom = "0";
|
||||
overlay.appendChild(rootOfCues);
|
||||
var paddedOverlay = window.document.createElement("div");
|
||||
paddedOverlay.style.position = "absolute";
|
||||
paddedOverlay.style.left = "0";
|
||||
paddedOverlay.style.right = "0";
|
||||
paddedOverlay.style.top = "0";
|
||||
paddedOverlay.style.bottom = "0";
|
||||
paddedOverlay.style.margin = CUE_BACKGROUND_PADDING;
|
||||
overlay.appendChild(paddedOverlay);
|
||||
|
||||
// Determine if we need to compute the display states of the cues. This could
|
||||
// be the case if a cue's state has been changed since the last computation or
|
||||
|
|
@ -953,13 +947,13 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
|
|||
// We don't need to recompute the cues' display states. Just reuse them.
|
||||
if (!shouldCompute(cues)) {
|
||||
for (var i = 0; i < cues.length; i++) {
|
||||
rootOfCues.appendChild(cues[i].displayState);
|
||||
paddedOverlay.appendChild(cues[i].displayState);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
var boxPositions = [],
|
||||
containerBox = BoxPosition.getSimpleBoxPosition(rootOfCues),
|
||||
containerBox = BoxPosition.getSimpleBoxPosition(paddedOverlay),
|
||||
fontSize = Math.round(containerBox.height * FONT_SIZE_PERCENT * 100) / 100;
|
||||
var styleOptions = {
|
||||
font: fontSize + "px " + FONT_STYLE
|
||||
|
|
@ -979,7 +973,7 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
|
|||
// Compute the intial position and styles of the cue div.
|
||||
styleBox = new CueStyleBox(window, cue, styleOptions);
|
||||
styleBox.cueDiv.style.setProperty("--cue-font-size", fontSize + "px");
|
||||
rootOfCues.appendChild(styleBox.div);
|
||||
paddedOverlay.appendChild(styleBox.div);
|
||||
|
||||
// Move the cue div to it's correct line position.
|
||||
moveBoxToLinePosition(window, styleBox, containerBox, boxPositions);
|
||||
|
|
|
|||
|
|
@ -773,6 +773,7 @@ video > .caption-box {
|
|||
width: 100%;
|
||||
height: 100%;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* ::cue default settings */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
[2_tracks.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1318542
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
[class_color.html]
|
||||
[align_middle.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
[background_properties.html]
|
||||
[align_middle_position_50.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
[basic.html]
|
||||
type: reftest
|
||||
disabled:
|
||||
if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1142501
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
[color_hex.html]
|
||||
[bidi_ruby.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
[bold_color.html]
|
||||
[u0041_first.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
[u05D0_first.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
[u0628_first.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
[bold_font_shorthand.html]
|
||||
[u06E9_no_strong_dir.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
[single_quote.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
[id_color.html]
|
||||
[size_90.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
[color_hsla.html]
|
||||
[size_99.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
[line_0_is_top.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
[repaint.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1332564
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
[bold_with_class.html]
|
||||
[font_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
[font_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
[white-space_pre-line_wrapped.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
[white-space_pre-wrap_wrapped.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected:
|
||||
if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
[white-space_pre_wrapped.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected:
|
||||
if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[background_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[background_shorthand_css_relative_url.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[bold_animation_with_timestamp.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[bold_background_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[bold_background_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[bold_font_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[bold_outline_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[bold_outline_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[bold_text-decoration_line-through.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[bold_text-shadow.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[bold_timestamp_future.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[bold_timestamp_past.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
[bold_transition_with_timestamp.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1288648
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
[bold_white-space_normal_wrapped.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
[bold_white-space_pre-line_wrapped.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[bold_with_class_object_specific_selector.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_animation_with_timestamp.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_background_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_background_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_font_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_font_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_outline_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_outline_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_text-decoration_line-through.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_text-shadow.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_timestamp_future.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_timestamp_past.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_transition_with_timestamp.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
[class_white-space_normal_wrapped.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
[class_white-space_pre-line_wrapped.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[class_with_class.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[class_with_class_object_specific_selector.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[color_rgba.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_animation_with_timestamp.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_background_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_background_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_color.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_font_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_font_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_outline_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_outline_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_text-decoration_line-through.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_text-shadow.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_timestamp_future.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_timestamp_past.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_transition_with_timestamp.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
[italic_white-space_normal_wrapped.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
[italic_white-space_pre-line_wrapped.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_with_class.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[italic_with_class_object_specific_selector.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[not_root_selector.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[outline_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[outline_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[root_namespace.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[root_selector.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[text-decoration_line-through.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[text-decoration_overline.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[text-decoration_overline_underline_line-through.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[text-decoration_underline.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[text-shadow.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_animation_with_timestamp.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_background_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_background_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_color.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_font_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_font_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_outline_properties.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_outline_shorthand.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_text-decoration_line-through.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_text-shadow.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_timestamp_future.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_timestamp_past.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_transition_with_timestamp.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
[underline_white-space_normal_wrapped.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
[underline_white-space_pre-line_wrapped.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_with_class.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[underline_with_class_object_specific_selector.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[voice_animation_with_timestamp.html]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче