From 792b7ad8c2ce9cc1e2384eb0ef77d86823b89202 Mon Sep 17 00:00:00 2001 From: Timothy Nikkel Date: Mon, 17 Feb 2014 15:10:01 -0600 Subject: [PATCH] Bug 970250. Add the ability to set a display port on scroll frames that aren't the root scroll frame to reftests. r=dbaron --- layout/tools/reftest/reftest-content.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js index 09ee3e2c764e..3eef5de990fc 100644 --- a/layout/tools/reftest/reftest-content.js +++ b/layout/tools/reftest/reftest-content.js @@ -204,9 +204,13 @@ function setupDisplayport(contentRootElement) { var dph = attrOrDefault("reftest-displayport-h", 0); var dpx = attrOrDefault("reftest-displayport-x", 0); var dpy = attrOrDefault("reftest-displayport-y", 0); + var elementID = attrOrDefault("reftest-displayport-element", null); if (dpw !== 0 || dph !== 0) { - LogInfo("Setting displayport to "); - windowUtils().setDisplayPortForElement(dpx, dpy, dpw, dph, content.document.documentElement); + var element = elementID ? content.document.getElementById(elementID) : null; + LogInfo("Setting displayport to " + + (element ? (" on element with id " + elementID) : " on document element")); + windowUtils().setDisplayPortForElement(dpx, dpy, dpw, dph, + element ? element : content.document.documentElement); } var asyncScroll = attrOrDefault("reftest-async-scroll", false); if (asyncScroll) {