Backed out changeset 9eb8652389f2 (bug 1427635) for clipboard failures at dom/browser-element/mochitest/test_browserElement_oop_CopyPaste.html

This commit is contained in:
Coroiu Cristina 2018-02-12 13:44:46 +02:00
parent e6123cd888
commit 5dbddf88c1

View File

@ -1945,11 +1945,8 @@ nsLayoutUtils::DoCompareTreePosition(nsIFrame* aFrame1,
}
AutoTArray<nsIFrame*,20> frame1Ancestors;
// Note that the order of the condition is important. We need to fill the
// ancestors even if aCommonAncestor is null, otherwise the code below makes
// no sense.
if (!FillAncestors(aFrame1, aCommonAncestor, &frame1Ancestors) &&
aCommonAncestor) {
if (aCommonAncestor &&
!FillAncestors(aFrame1, aCommonAncestor, &frame1Ancestors)) {
// We reached the root of the frame tree ... if aCommonAncestor was set,
// it is wrong
return DoCompareTreePosition(aFrame1, aFrame2,