Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 00:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1682200 - Apply the top level resolution for iframes in the same process of the top level document. r=botond

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D100280
This commit is contained in:
Hiroyuki Ikezoe 2021-01-11 23:52:09 +00:00
parent 58f190d6a4
commit e2617c5fcf
3 changed files with 129 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/layers/apz/test/mochitest/browser_test_group_fission.js
View File

@ -51,6 +51,14 @@ add_task(async function test_main() {
prefs: [["apz.max_tap_time", 10000]],
},
{ file: "helper_fission_inactivescroller_under_oopif.html" },
{
file: "helper_fission_tap_on_zoomed.html",
prefs: [["apz.max_tap_time", 10000]],
},
{
file: "helper_fission_tap_in_nested_iframe_on_zoomed.html",
prefs: [["apz.max_tap_time", 10000]],
},
// add additional tests here
];
if (isWebRender) {
@ -63,11 +71,6 @@ add_task(async function test_main() {
{
file: "helper_fission_animation_styling_in_transformed_oopif.html",
},
// Bug 1682200: This test fails on WebRender.
{
file: "helper_fission_tap_on_zoomed.html",
prefs: [["apz.max_tap_time", 10000]],
},
]);
}

106
gfx/layers/apz/test/mochitest/helper_fission_tap_in_nested_iframe_on_zoomed.html Normal file
View File

@ -0,0 +1,106 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test to ensure events get delivered properly for a nested OOP iframe</title>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<script src="/tests/SimpleTest/paint_listener.js"></script>
<script src="helper_fission_utils.js"></script>
<script src="apz_test_utils.js"></script>
<script src="apz_test_native_event_utils.js"></script>
<script>
// Copied from helper_fission_tap_on_zoomed.html. In this test
// SpecialPowers.spawn is used instead of FissionTestHelper.sendToOopif to
// handle scripts in a nested OOP iframe.
fission_subtest_init();
SpecialPowers.getDOMWindowUtils(window).setResolutionAndScaleTo(2.0);
FissionTestHelper.startTestPromise
.then(waitUntilApzStable)
.then(loadOOPIFrame("testframe", "helper_fission_empty.html"))
.then(waitUntilApzStable)
.then(test)
.then(FissionTestHelper.subtestDone, FissionTestHelper.subtestFailed);
function failsafe() {
// Catch and fail faster on the case where the click ends up not going to
// the iframe like it should. Otherwise the test hangs until timeout which
// is more painful.
document.addEventListener("click", function(e) {
dump(`${location.href} got click at ${e.clientX},${e.clientY}\n`);
ok(false, "The OOPIF hosting page should not have gotten the click");
setTimeout(FissionTestHelper.subtestDone, 0);
}, {once: true});
}
async function test() {
let iframeElement = document.getElementById("testframe");
// Load another OOP document in the parent OOP iframe.
await SpecialPowers.spawn(iframeElement, [], async () => {
const iframe = content.document.createElement("iframe");
iframe.src =
"https://example.org/browser/gfx/layers/apz/test/mochitest/helper_fission_empty.html";
iframe.style.width = "400px";
iframe.style.height = "300px";
iframe.style.border = "none";
content.document.body.appendChild(iframe);
await new Promise(resolve => {
iframe.addEventListener("load", resolve, {once: true});
});
await SpecialPowers.spawn(iframe, [], async () => {
await content.wrappedJSObject.promiseApzFlushedRepaints(content.window);
});
});
// Set a click event listener in the nested OOP document.
const iframePromise = SpecialPowers.spawn(iframeElement, [], async () => {
const iframe = content.document.querySelector("iframe");
const result = await SpecialPowers.spawn(iframe, [], async () => {
return new Promise(resolve => {
content.document.addEventListener("click", e => {
dump(`OOPIF got click at ${e.clientX},${e.clientY}\n`);
resolve({ x: e.clientX, y: e.clientY });
}, {once: true});
});
});
return result;
});
synthesizeNativeTap(document.documentElement, 200, 200, function() {
dump("Finished synthesizing click, waiting for OOPIF message...\n");
});
let iframeResponse = await iframePromise;
dump("OOPIF response: " + JSON.stringify(iframeResponse) + "\n");
let expected_coord = 100; // because the parent iframe is offseted by (100, 100).
ok(Math.abs(iframeResponse.x - expected_coord) < 3,
`x-coord ${iframeResponse.x} landed near expected value ${expected_coord}`);
ok(Math.abs(iframeResponse.y - expected_coord) < 3,
`y-coord ${iframeResponse.y} landed near expected value ${expected_coord}`);
}
</script>
<style>
body, html {
margin: 0;
}
div {
margin-left: 100px;
margin-top: 100px;
width: 500px;
}
iframe {
width: 400px;
height: 300px;
border: solid 1px black;
}
</style>
</head>
<body onload="failsafe()">
<div><iframe id="testframe"></iframe></div>
</body>
</html>

17
layout/generic/nsSubDocumentFrame.cpp
View File

@ -1427,8 +1427,21 @@ bool nsDisplayRemote::UpdateScrollData(
if (aLayerData) {
aLayerData->SetReferentId(mLayersId);
aLayerData->SetTransform(
mozilla::gfx::Matrix4x4::Translation(mOffset.x, mOffset.y, 0.0));
Matrix4x4 m = Matrix4x4::Translation(mOffset.x, mOffset.y, 0.0);
// Apply the top level resolution if we are in the same process of the top
// level document. We don't need to apply it in cases where we are in OOP
// iframes since it will be applied later in
// HitTestingTreeNode::GetTransformToGecko by walking up the tree node.
nsPresContext* inProcessRootContext =
mFrame->PresContext()->GetInProcessRootContentDocumentPresContext();
if (inProcessRootContext &&
inProcessRootContext->IsRootContentDocumentCrossProcess()) {
float resolution = inProcessRootContext->PresShell()->GetResolution();
m.PostScale(resolution, resolution, 1.0);
}
aLayerData->SetTransform(m);
aLayerData->SetEventRegionsOverride(mEventRegionsOverride);
aLayerData->SetRemoteDocumentSize(GetFrameSize(mFrame));
}