aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmliframeelement.rs
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2014-11-10 11:34:44 -0800
committerMartin Robinson <mrobinson@igalia.com>2014-11-11 17:36:19 -0800
commitfbb1e0c6b848303be79d2f30ce6257d70a8e38da (patch)
tree476ef80f614dc1112644f5729ad195a60627a1c6 /components/script/dom/htmliframeelement.rs
parent750bedab810f4b2fe8fc9c47798e120c997a4234 (diff)
downloadservo-fbb1e0c6b848303be79d2f30ce6257d70a8e38da.tar.gz
servo-fbb1e0c6b848303be79d2f30ce6257d70a8e38da.zip
Send incremental frame tree updates to the compositor
This allows the compositor to add frames after the call to SetIds, where the initial frame tree is created. There are still some issues preventing proper late frame creation, but this prevents crashes when it happens. Fixes #3738.
Diffstat (limited to 'components/script/dom/htmliframeelement.rs')
-rw-r--r--components/script/dom/htmliframeelement.rs12
1 files changed, 3 insertions, 9 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index 902ee4ee6ea..3312925e2ff 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -4,7 +4,6 @@
use dom::attr::Attr;
use dom::attr::AttrHelpers;
-use dom::bindings::codegen::Bindings::DocumentBinding::{DocumentMethods, DocumentReadyStateValues};
use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding;
use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods;
use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast};
@@ -16,7 +15,7 @@ use dom::element::{HTMLIFrameElementTypeId, Element};
use dom::element::AttributeHandlers;
use dom::eventtarget::{EventTarget, NodeTargetTypeId};
use dom::htmlelement::HTMLElement;
-use dom::node::{Node, NodeHelpers, ElementNodeTypeId, window_from_node, document_from_node};
+use dom::node::{Node, NodeHelpers, ElementNodeTypeId, window_from_node};
use dom::virtualmethods::VirtualMethods;
use dom::window::Window;
use page::IterablePage;
@@ -120,13 +119,8 @@ impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> {
subpage_id: subpage_id,
}));
- let doc = document_from_node(self).root();
- if doc.ReadyState() == DocumentReadyStateValues::Loading {
- // https://github.com/servo/servo/issues/3738
- // We can't handle dynamic frame tree changes in the compositor right now.
- let ConstellationChan(ref chan) = page.constellation_chan;
- chan.send(ScriptLoadedURLInIFrameMsg(url, page.id, subpage_id, sandboxed));
- }
+ let ConstellationChan(ref chan) = page.constellation_chan;
+ chan.send(ScriptLoadedURLInIFrameMsg(url, page.id, subpage_id, sandboxed));
}
}