From bd22249ff09613a7f9c859c2787c334f0aab5f0e Mon Sep 17 00:00:00 2001 From: Csoregi Natalia Date: Thu, 13 Aug 2020 21:13:08 +0300 Subject: [PATCH] Backed out 2 changesets (bug 1658469) for assertion failures on nsVideoFrame.cpp. CLOSED TREE Backed out changeset 08a78618c76c (bug 1658469) Backed out changeset 5c8a07fc83ed (bug 1658469) --- dom/base/ShadowRoot.cpp | 4 ---- layout/base/tests/chrome/printpreview_helper.xhtml | 9 ++------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dom/base/ShadowRoot.cpp b/dom/base/ShadowRoot.cpp index 2ba888031fb4..57f3725aed8c 100644 --- a/dom/base/ShadowRoot.cpp +++ b/dom/base/ShadowRoot.cpp @@ -95,10 +95,6 @@ JSObject* ShadowRoot::WrapNode(JSContext* aCx, } void ShadowRoot::CloneInternalDataFrom(ShadowRoot* aOther) { - if (aOther->IsUAWidget()) { - SetIsUAWidget(); - } - size_t sheetCount = aOther->SheetCount(); for (size_t i = 0; i < sheetCount; ++i) { StyleSheet* sheet = aOther->SheetAt(i); diff --git a/layout/base/tests/chrome/printpreview_helper.xhtml b/layout/base/tests/chrome/printpreview_helper.xhtml index 5c846063aea7..225a9444798e 100644 --- a/layout/base/tests/chrome/printpreview_helper.xhtml +++ b/layout/base/tests/chrome/printpreview_helper.xhtml @@ -424,7 +424,7 @@ async function compareFiles(src1, src2, options = {}) { await new Promise((resolve) => { iframeElement.addEventListener("load", resolve, { capture: true, once: true }); - iframeElement.setAttribute("src", new URL(src1, BASE).href); + iframeElement.setAttribute("src", BASE + src1); }); if (messagePromise) { @@ -438,7 +438,7 @@ async function compareFiles(src1, src2, options = {}) { await new Promise((resolve) => { iframeElement.addEventListener("load", resolve, { capture: true, once: true }); - iframeElement.setAttribute("src", new URL(src2, BASE).href); + iframeElement.setAttribute("src", BASE + src2); }); await printpreview(options.ref || options); @@ -551,11 +551,6 @@ async function runTest20() { exitprintpreview(); - requestAnimationFrame(() => setTimeout(runTest21)); -} - -async function runTest21() { - await compareFiles("data:text/html,