aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/script_task.rs
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2013-09-10 15:43:28 -0700
committerJosh Matthews <josh@joshmatthews.net>2013-09-11 11:57:40 -0700
commit96403247218ce628a39b954c361d0707d0d0f97d (patch)
tree4f17ffd5844dfc70688c7fd75e30e7b35aa5797b /src/components/script/script_task.rs
parent25a3d4a93fd9892686976d1084d3b23baa05d11a (diff)
downloadservo-96403247218ce628a39b954c361d0707d0d0f97d.tar.gz
servo-96403247218ce628a39b954c361d0707d0d0f97d.zip
Make sandboxed iframes run with different script tasks.
Diffstat (limited to 'src/components/script/script_task.rs')
-rw-r--r--src/components/script/script_task.rs12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs
index 759d37a6dc4..9d45dc7d8dc 100644
--- a/src/components/script/script_task.rs
+++ b/src/components/script/script_task.rs
@@ -22,7 +22,7 @@ use layout_interface::ReflowMsg;
use layout_interface;
use servo_msg::constellation_msg::{ConstellationChan, LoadUrlMsg, NavigationDirection};
use servo_msg::constellation_msg::{PipelineId, SubpageId, RendererReadyMsg};
-use servo_msg::constellation_msg::{LoadIframeUrlMsg};
+use servo_msg::constellation_msg::{LoadIframeUrlMsg, IFrameSandboxed, IFrameUnsandboxed};
use servo_msg::constellation_msg;
use std::cell::Cell;
@@ -641,12 +641,18 @@ impl ScriptTask {
Some(HtmlDiscoveredStyle(sheet)) => {
page.layout_chan.send(AddStylesheetMsg(sheet));
}
- Some(HtmlDiscoveredIFrame((iframe_url, subpage_id, size_future))) => {
+ Some(HtmlDiscoveredIFrame((iframe_url, subpage_id, size_future, sandboxed))) => {
page.next_subpage_id = SubpageId(*subpage_id + 1);
+ let sandboxed = if sandboxed {
+ IFrameSandboxed
+ } else {
+ IFrameUnsandboxed
+ };
self.constellation_chan.send(LoadIframeUrlMsg(iframe_url,
pipeline_id,
subpage_id,
- size_future));
+ size_future,
+ sandboxed));
}
None => break
}