Skip to main content

Browse the archive

Revision fc7c0b7d097b3f584889127fd6ea350a1980cc7a authored by Emilio Cobos Álvarez on 09 April 2018, 07:01:25 UTC, committed by moz-wptsync-bot on 09 April 2018, 07:52:06 UTC 
Make LazyFC assertions actually hold.
 
The code was trying to assert that we had frames constructed for all the nodes
in the parent chain, but we don't bail out in the
!GetContentInsertionFrameFor(aContainer) in the case that it's a children
element, because they actually have no insertion frame, though their children
do.

Move the LazyFC check after the insertion point check. That makes the previous
check work on the insertion point of the child, which makes it sound.

This also fixes bug 1410020, and with it a Shadow DOM test-case that was failing
because we had two sibling assigned to two different <slot>s, and the second one
wasn't getting properly flagged, and thus the second sibling never got a frame.

The other two test failures in this test are an event dispatch failure, where
the position of the target is not what the test expects (we don't account for
margin and padding). Filed that as bug 1450027.

Also, added a test for which we have wrong layout without these patches, and
that crashes with "Called Servo_Element_IsDisplayNone" with the first patch of
this bug applied but not this one, due to the bogus check mentioned above.
bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1303605
gecko-commit: 12a824f8d55a8fb0396fb2132974f8223c6a9606
gecko-integration-branch: central
gecko-reviewers: bz
1 parent a835486
Raw File
xml_xpath_runner.html 
<!doctype html>
<title>XPath tests</title>
<script src='/resources/testharness.js'></script>
<script src='/resources/testharnessreport.js'></script>
<script>
setup({ explicit_done: true });

function find_child_element(context, element) {
  for (var i = 0; i < context.childNodes.length; i++) {
    var child = context.childNodes[i];
    if (child.nodeType === Node.ELEMENT_NODE && child.tagName === element)
      return child;
  }
}

function xpath_test(test_el) {
  /* note this func adopts the tree! */
  var new_doc = document.implementation.createDocument("", "");
  var xpath = find_child_element(test_el, "xpath");
  var result = find_child_element(test_el, "result");
  var namespace = find_child_element(result, "namespace");
  var localname = find_child_element(result, "localname");
  var nth = find_child_element(result, "nth");
  var tree = find_child_element(test_el, "tree");
  var actual_tree = new_doc.adoptNode(tree.firstElementChild);
  new_doc.appendChild(actual_tree);
  test(function() {
    var result = new_doc.evaluate(xpath.textContent, // expression
                                  actual_tree, // context node
                                  new_doc.createNSResolver(actual_tree), // resolver
                                  XPathResult.ANY_TYPE, // type
                                  null); // result
    var matched = [];
    var cur;
    while ((cur = result.iterateNext()) !== null) {
      matched.push(cur);
    }
    assert_equals(matched.length, 1, "Should match one node");
    var similar = new_doc.getElementsByTagNameNS(namespace.textContent,
                                                 localname.textContent);
    assert_equals(matched[0], similar[nth.textContent]);
  });
}

var xhr = new XMLHttpRequest();
xhr.open("GET", "xml_xpath_tests.xml");
xhr.onload = function(e) {
  var tests = xhr.responseXML.documentElement;
  for (var i = 0; i < tests.childNodes.length; i++) {
    var child = tests.childNodes[i];
    if (child.nodeType === Node.ELEMENT_NODE) {
      xpath_test(child);
    }
  }
  done();
};
xhr.send();
</script>
back to top