Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8322 - mrobinson:iframe-resizing, r=pcwalton

Browse source 
Properly resize iframe root layers

When a layer containing an iframe changes, we also need to resize the
root layer of the subpage. This ensures that content from the child
layer tree is masked to the new size.

Fixes #8301.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8322)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-05 02:23:43 +05:30
commit dc159d055c
5 changed files with 72 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/compositing/compositor.rs
View file

@ -791,8 +791,20 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.pipeline_details.remove(&pipeline_id);
}
fn update_layer_if_exists(&mut self, pipeline_id: PipelineId, properties: LayerProperties)
fn update_layer_if_exists(&mut self,
pipeline_id: PipelineId,
properties: LayerProperties)
-> bool {
if let Some(subpage_id) = properties.subpage_pipeline_id {
match self.find_layer_with_pipeline_and_layer_id(subpage_id, LayerId::null()) {
Some(layer) => {
*layer.bounds.borrow_mut() = Rect::from_untyped(
&Rect::new(Point2D::zero(), properties.rect.size));
}
None => warn!("Tried to update non-existent subpage root layer: {:?}", subpage_id),
}
}
match self.find_layer_with_pipeline_and_layer_id(pipeline_id, properties.id) {
Some(existing_layer) => {
existing_layer.update_layer(properties);

24
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -4151,6 +4151,18 @@
"url": "/_mozilla/mozilla/canvas/drawimage_html_image_9.html"
}
],
"mozilla/iframe/resize_after_load.html": [
{
"path": "mozilla/iframe/resize_after_load.html",
"references": [
[
"/_mozilla/mozilla/iframe/resize_after_load_ref.html",
"=="
]
],
"url": "/_mozilla/mozilla/iframe/resize_after_load.html"
}
],
"mozilla/webgl/clearcolor.html": [
{
"path": "mozilla/webgl/clearcolor.html",
@ -8952,6 +8964,18 @@
"url": "/_mozilla/mozilla/canvas/drawimage_html_image_9.html"
}
],
"mozilla/iframe/resize_after_load.html": [
{
"path": "mozilla/iframe/resize_after_load.html",
"references": [
[
"/_mozilla/mozilla/iframe/resize_after_load_ref.html",
"=="
]
],
"url": "/_mozilla/mozilla/iframe/resize_after_load.html"
}
],
"mozilla/webgl/clearcolor.html": [
{
"path": "mozilla/webgl/clearcolor.html",

24
tests/wpt/mozilla/tests/mozilla/iframe/resize_after_load.html Normal file
View file

@ -0,0 +1,24 @@
<!doctype html>
<html class="reftest-wait">
<head>
<meta charset=utf-8>
<title>Dynamically growing an iframe element</title>
<link rel=match href=/_mozilla/mozilla/iframe/resize_after_load_ref.html>
</head>
<body>
<iframe style="border: 0px; display: block; height: 100px; width: 50px" src="resources/green_inner_frame.html"></iframe>
<script>
var iframe = document.getElementsByTagName('iframe')[0];
iframe.onload = function() {
document.querySelector('iframe').style.width = "100px";
// We do this in a timeout, so that the compositor has a chance
// to update the layer tree.
setTimeout(function() {
document.documentElement.classList.remove("reftest-wait");
}, 0);
}
</script>
</body>
</html>

6
tests/wpt/mozilla/tests/mozilla/iframe/resize_after_load_ref.html Normal file
View file

@ -0,0 +1,6 @@
<!doctype html>
<html>
<body>
<div style="height: 100px; width: 100px; background: green;"></div>
</body>
</html>

5
tests/wpt/mozilla/tests/mozilla/iframe/resources/green_inner_frame.html Normal file
View file

@ -0,0 +1,5 @@
<!DOCTYPE html>
<html>
<body style="background: green;">
</body>
</html>