diff options
22 files changed, 78 insertions, 1003 deletions
diff --git a/Cargo.lock b/Cargo.lock index 0495a26b832..2f9a03801fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1969,11 +1969,6 @@ dependencies = [ ] [[package]] -name = "open" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "openssl" version = "0.9.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2378,7 +2373,6 @@ dependencies = [ "net_traits 0.0.1", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)", - "open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3665,7 +3659,6 @@ dependencies = [ "checksum offscreen_gl_context 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb69c6b9fff6f2166af94c72cf6333b8bb883910809a396b53a881fd6b5e913" "checksum ogg 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7137bf02687385302f4c0aecd77cfce052b69f5b4ee937be778e125c62f67e30" "checksum ogg_metadata 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fc665717454399cba557c55ad226148996e9266ee291f8a37a98bb2cded0a490" -"checksum open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842" "checksum openssl 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)" = "419ef26bb651d72b6c5a603bcc4e4856a362460e62352dfffa53de91d2e81181" "checksum openssl-sys 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5483bdc56756041ba6aa37c9cb59cc2219f012a2a1377d97ad35556ac6676ee7" "checksum ordered-float 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da12c96037889ae0be29dd2bdd260e5a62a7df24e6466d5a15bb8131c1c200a8" diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index b42030d5fe1..62d5740d31a 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -21,7 +21,6 @@ use script_traits::{MouseButton, MouseEventType, ScrollState, TouchEventType, To use script_traits::{UntrustedNodeAddress, WindowSizeData, WindowSizeType}; use script_traits::CompositorEvent::{MouseMoveEvent, MouseButtonEvent, TouchEvent}; use servo_config::opts; -use servo_config::prefs::PREFS; use servo_geometry::DeviceIndependentPixel; use std::collections::HashMap; use std::fs::File; diff --git a/components/config/opts.rs b/components/config/opts.rs index 8c9bf1cbd3b..fbca63417ae 100644 --- a/components/config/opts.rs +++ b/components/config/opts.rs @@ -609,7 +609,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult { opts.optopt("", "content-process" , "Run as a content process and connect to the given pipe", "servo-ipc-channel.abcdefg"); opts.optmulti("", "pref", - "A preference to set to enable", "dom.mozbrowser.enabled"); + "A preference to set to enable", "dom.bluetooth.enabled"); opts.optflag("b", "no-native-titlebar", "Do not use native titlebar"); opts.optflag("w", "webrender", "Use webrender backend"); opts.optopt("G", "graphics", "Select graphics backend (gl or es2)", "gl"); diff --git a/components/config/prefs.rs b/components/config/prefs.rs index 3efccecb8bc..285cdd9402d 100644 --- a/components/config/prefs.rs +++ b/components/config/prefs.rs @@ -228,10 +228,6 @@ impl Preferences { self.0.read().unwrap().clone() } - pub fn is_mozbrowser_enabled(&self) -> bool { - self.get("dom.mozbrowser.enabled").as_boolean().unwrap_or(false) - } - pub fn set(&self, name: &str, value: PrefValue) { let mut prefs = self.0.write().unwrap(); if let Some(pref) = prefs.get_mut(name) { diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs index 09bce57bb90..cb6bbb0c7a6 100644 --- a/components/constellation/constellation.rs +++ b/components/constellation/constellation.rs @@ -43,9 +43,6 @@ //! +------------+ +------------+ //! ``` // -//! Complicating matters, there are also mozbrowser iframes, which are top-level -//! iframes with a parent. -//! //! The constellation also maintains channels to threads, including: //! //! * The script and layout threads. @@ -59,8 +56,7 @@ //! to track the evolving state of the browsing context tree. //! //! The constellation acts as a logger, tracking any `warn!` messages from threads, -//! and converting any `error!` or `panic!` into a crash report, which is filed -//! using an appropriate `mozbrowsererror` event. +//! and converting any `error!` or `panic!` into a crash report. //! //! Since there is only one constellation, and its responsibilities include crash reporting, //! it is very important that it does not panic. @@ -116,7 +112,7 @@ use ipc_channel::router::ROUTER; use itertools::Itertools; use layout_traits::LayoutThreadFactory; use log::{Log, LogLevel, LogLevelFilter, LogMetadata, LogRecord}; -use msg::constellation_msg::{BrowsingContextId, TopLevelBrowsingContextId, FrameType, PipelineId}; +use msg::constellation_msg::{BrowsingContextId, TopLevelBrowsingContextId, PipelineId}; use msg::constellation_msg::{Key, KeyModifiers, KeyState}; use msg::constellation_msg::{PipelineNamespace, PipelineNamespaceId, TraversalDirection}; use net_traits::{self, IpcSend, FetchResponseMsg, ResourceThreads}; @@ -133,8 +129,8 @@ use script_traits::{DocumentActivity, DocumentState, LayoutControlMsg, LoadData} use script_traits::{IFrameLoadInfo, IFrameLoadInfoWithData, IFrameSandboxState, TimerSchedulerMsg}; use script_traits::{LayoutMsg as FromLayoutMsg, ScriptMsg as FromScriptMsg, ScriptThreadFactory}; use script_traits::{LogEntry, ScriptToConstellationChan, ServiceWorkerMsg, webdriver_msg}; -use script_traits::{MozBrowserErrorType, MozBrowserEvent, WebDriverCommandMsg, WindowSizeData}; -use script_traits::{SWManagerMsg, ScopeThings, UpdatePipelineIdReason, WindowSizeType}; +use script_traits::{SWManagerMsg, ScopeThings, UpdatePipelineIdReason, WebDriverCommandMsg}; +use script_traits::{WindowSizeData, WindowSizeType}; use serde::{Deserialize, Serialize}; use servo_config::opts; use servo_config::prefs::PREFS; @@ -658,7 +654,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> pipeline_id: PipelineId, browsing_context_id: BrowsingContextId, top_level_browsing_context_id: TopLevelBrowsingContextId, - parent_info: Option<(PipelineId, FrameType)>, + parent_info: Option<PipelineId>, initial_window_size: Option<TypedSize2D<f32, CSSPixel>>, // TODO: we have to provide ownership of the LoadData // here, because it will be send on an ipc channel, @@ -690,7 +686,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> }, } } else if let Some(parent) = parent_info - .and_then(|(pipeline_id, _)| self.pipelines.get(&pipeline_id)) { + .and_then(|pipeline_id| self.pipelines.get(&pipeline_id)) { (Some(parent.event_loop.clone()), None) } else if let Some(creator) = load_data.creator_pipeline_id .and_then(|pipeline_id| self.pipelines.get(&pipeline_id)) { @@ -708,7 +704,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> }; let parent_visibility = parent_info - .and_then(|(parent_pipeline_id, _)| self.pipelines.get(&parent_pipeline_id)) + .and_then(|parent_pipeline_id| self.pipelines.get(&parent_pipeline_id)) .map(|pipeline| pipeline.visible); let prev_visibility = self.browsing_contexts.get(&browsing_context_id) @@ -824,12 +820,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> ) } - /// Is the joint session future empty? - fn joint_session_future_is_empty(&self, top_level_browsing_context_id: TopLevelBrowsingContextId) -> bool { - self.all_browsing_contexts_iter(top_level_browsing_context_id) - .all(|browsing_context| browsing_context.next.is_empty()) - } - #[cfg(feature = "unstable")] /// The joint session past is the merge of the session past of every /// browsing_context, sorted reverse chronologically. @@ -866,12 +856,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> ) } - /// Is the joint session past empty? - fn joint_session_past_is_empty(&self, top_level_browsing_context_id: TopLevelBrowsingContextId) -> bool { - self.all_browsing_contexts_iter(top_level_browsing_context_id) - .all(|browsing_context| browsing_context.prev.is_empty()) - } - /// Create a new browsing context and update the internal bookkeeping. fn new_browsing_context(&mut self, browsing_context_id: BrowsingContextId, @@ -885,7 +869,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> // If a child browsing_context, add it to the parent pipeline. let parent_info = self.pipelines.get(&pipeline_id) .and_then(|pipeline| pipeline.parent_info); - if let Some((parent_id, _)) = parent_info { + if let Some(parent_id) = parent_info { if let Some(parent) = self.pipelines.get_mut(&parent_id) { parent.add_child(browsing_context_id); } @@ -1173,10 +1157,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> debug!("constellation got postMessage message"); self.handle_post_message_msg(browsing_context_id, origin, data); } - FromScriptMsg::MozBrowserEvent(pipeline_id, event) => { - debug!("constellation got mozbrowser event message"); - self.handle_mozbrowser_event_msg(pipeline_id, source_top_ctx_id, event); - } FromScriptMsg::Focus => { debug!("constellation got focus message"); self.handle_focus_msg(source_pipeline_id); @@ -1502,7 +1482,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> fn handle_panic(&mut self, top_level_browsing_context_id: TopLevelBrowsingContextId, reason: String, - backtrace: Option<String>) + _backtrace: Option<String>) { if opts::get().hard_fail { // It's quite difficult to make Servo exit cleanly if some threads have failed. @@ -1515,8 +1495,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> let browsing_context_id = BrowsingContextId::from(top_level_browsing_context_id); - // Notify the browser chrome that the pipeline has failed - self.trigger_mozbrowsererror(top_level_browsing_context_id, reason, backtrace); + // FIXME: report to embedder: (top_level_browsing_context_id, reason, backtrace); let (window_size, pipeline_id) = { let browsing_context = self.browsing_contexts.get(&browsing_context_id); @@ -1656,7 +1635,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> fn handle_subframe_loaded(&mut self, pipeline_id: PipelineId) { let (browsing_context_id, parent_id) = match self.pipelines.get(&pipeline_id) { Some(pipeline) => match pipeline.parent_info { - Some((parent_id, _)) => (pipeline.browsing_context_id, parent_id), + Some(parent_id) => (pipeline.browsing_context_id, parent_id), None => return debug!("Pipeline {} has no parent.", pipeline_id), }, None => return warn!("Pipeline {} loaded after closure.", pipeline_id), @@ -1732,7 +1711,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> self.new_pipeline(load_info.info.new_pipeline_id, load_info.info.browsing_context_id, load_info.info.top_level_browsing_context_id, - Some((load_info.info.parent_pipeline_id, load_info.info.frame_type)), + Some(load_info.info.parent_pipeline_id), window_size, load_data.clone(), load_info.sandbox, @@ -1752,7 +1731,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> let IFrameLoadInfo { parent_pipeline_id, new_pipeline_id, - frame_type, replace, browsing_context_id, top_level_browsing_context_id, @@ -1772,7 +1750,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> Pipeline::new(new_pipeline_id, browsing_context_id, top_level_browsing_context_id, - Some((parent_pipeline_id, frame_type)), + Some(parent_pipeline_id), script_sender, layout_sender, self.compositor_proxy.clone(), @@ -1841,27 +1819,11 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> fn handle_alert(&mut self, top_level_browsing_context_id: TopLevelBrowsingContextId, - message: String, + _message: String, sender: IpcSender<bool>) { - let browser_pipeline_id = self.browsing_contexts.get(&BrowsingContextId::from(top_level_browsing_context_id)) - .and_then(|browsing_context| self.pipelines.get(&browsing_context.pipeline_id)) - .and_then(|pipeline| pipeline.parent_info) - .map(|(browser_pipeline_id, _)| browser_pipeline_id); - let mozbrowser_modal_prompt = PREFS.is_mozbrowser_enabled() && browser_pipeline_id.is_some(); - - if mozbrowser_modal_prompt { - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowsershowmodalprompt - let prompt_type = String::from("alert"); - let title = String::from("Alert"); - let return_value = String::from(""); - let event = MozBrowserEvent::ShowModalPrompt(prompt_type, title, message, return_value); - match browser_pipeline_id.and_then(|id| self.pipelines.get(&id)) { - None => warn!("Alert sent after browser pipeline closure."), - Some(pipeline) => pipeline.trigger_mozbrowser_event(Some(top_level_browsing_context_id), event), - } - } - - let result = sender.send(!mozbrowser_modal_prompt); + // FIXME: forward alert event to embedder + // https://github.com/servo/servo/issues/19992 + let result = sender.send(true); if let Err(e) = result { let ctx_id = BrowsingContextId::from(top_level_browsing_context_id); let pipeline_id = match self.browsing_contexts.get(&ctx_id) { @@ -1902,7 +1864,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> } }; match parent_info { - Some((parent_pipeline_id, _)) => { + Some(parent_pipeline_id) => { // Find the script thread for the pipeline containing the iframe // and issue an iframe load through there. let msg = ConstellationControlMsg::Navigate(parent_pipeline_id, @@ -2131,22 +2093,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> } } - fn handle_mozbrowser_event_msg(&mut self, - pipeline_id: PipelineId, - top_level_browsing_context_id: TopLevelBrowsingContextId, - event: MozBrowserEvent) { - assert!(PREFS.is_mozbrowser_enabled()); - - // Find the script channel for the given parent pipeline, - // and pass the event to that script thread. - // If the pipeline lookup fails, it is because we have torn down the pipeline, - // so it is reasonable to silently ignore the event. - match self.pipelines.get(&pipeline_id) { - Some(pipeline) => pipeline.trigger_mozbrowser_event(Some(top_level_browsing_context_id), event), - None => warn!("Pipeline {:?} handling mozbrowser event after closure.", pipeline_id), - } - } - fn handle_get_pipeline(&mut self, browsing_context_id: BrowsingContextId, resp_chan: IpcSender<Option<PipelineId>>) { @@ -2175,7 +2121,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> Some(pipeline) => (pipeline.browsing_context_id, pipeline.parent_info), None => return warn!("Pipeline {:?} focus parent after closure.", pipeline_id), }; - let (parent_pipeline_id, _) = match parent_info { + let parent_pipeline_id = match parent_info { Some(info) => info, None => return debug!("Pipeline {:?} focus has no parent.", pipeline_id), }; @@ -2234,7 +2180,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> None => return warn!("Visibity change for closed pipeline {:?}.", pipeline_id), Some(pipeline) => (pipeline.browsing_context_id, pipeline.parent_info), }; - if let Some((parent_pipeline_id, _)) = parent_pipeline_info { + if let Some(parent_pipeline_id) = parent_pipeline_info { let visibility_msg = ConstellationControlMsg::NotifyVisibilityChange(parent_pipeline_id, browsing_context_id, visibility); @@ -2430,7 +2376,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> // Update the owning iframe to point to the new pipeline id. // This makes things like contentDocument work correctly. - if let Some((parent_pipeline_id, frame_type)) = parent_info { + if let Some(parent_pipeline_id) = parent_info { let msg = ConstellationControlMsg::UpdatePipelineId(parent_pipeline_id, browsing_context_id, pipeline_id, UpdatePipelineIdReason::Traversal); let result = match self.pipelines.get(&parent_pipeline_id) { @@ -2440,12 +2386,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> if let Err(e) = result { self.handle_send_error(parent_pipeline_id, e); } - - // If this is a mozbrowser iframe, send a mozbrowser location change event. - // This is the result of a back/forward traversal. - if frame_type == FrameType::MozBrowserIFrame { - self.trigger_mozbrowserlocationchange(top_level_id); - } } } @@ -2579,11 +2519,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> self.notify_history_changed(change.top_level_browsing_context_id); } - // If the navigation is for a top-level browsing context, inform mozbrowser - if change.browsing_context_id == change.top_level_browsing_context_id { - self.trigger_mozbrowserlocationchange(change.top_level_browsing_context_id); - } - self.update_frame_tree_if_active(change.top_level_browsing_context_id); } @@ -2592,7 +2527,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> // Notify the parent (if there is one). if let Some(pipeline) = self.pipelines.get(&pipeline_id) { - if let Some((parent_pipeline_id, _)) = pipeline.parent_info { + if let Some(parent_pipeline_id) = pipeline.parent_info { if let Some(parent_pipeline) = self.pipelines.get(&parent_pipeline_id) { let msg = ConstellationControlMsg::UpdatePipelineId(parent_pipeline_id, pipeline.browsing_context_id, pipeline_id, UpdatePipelineIdReason::Navigation); @@ -2759,7 +2694,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> if let Some(ancestor) = self.pipelines.get(&ancestor_id) { if let Some(browsing_context) = self.browsing_contexts.get(&ancestor.browsing_context_id) { if browsing_context.pipeline_id == ancestor_id { - if let Some((parent_id, FrameType::IFrame)) = ancestor.parent_info { + if let Some(parent_id) = ancestor.parent_info { ancestor_id = parent_id; continue; } else { @@ -2887,7 +2822,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> let parent_info = self.pipelines.get(&browsing_context.pipeline_id) .and_then(|pipeline| pipeline.parent_info); - if let Some((parent_pipeline_id, _)) = parent_info { + if let Some(parent_pipeline_id) = parent_info { match self.pipelines.get_mut(&parent_pipeline_id) { None => return warn!("Pipeline {:?} child closed after parent.", parent_pipeline_id), Some(parent_pipeline) => parent_pipeline.remove_child(browsing_context_id), @@ -2982,13 +2917,8 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> if let Some((ref mut rng, probability)) = self.random_pipeline_closure { if let Some(pipeline_id) = rng.choose(&*pipeline_ids) { if let Some(pipeline) = self.pipelines.get(pipeline_id) { - // Don't kill the mozbrowser pipeline - if PREFS.is_mozbrowser_enabled() && pipeline.parent_info.is_none() { - info!("Not closing mozbrowser pipeline {}.", pipeline_id); - } else if - self.pending_changes.iter().any(|change| change.new_pipeline_id == pipeline.id) && - probability <= rng.gen::<f32>() - { + if self.pending_changes.iter().any(|change| change.new_pipeline_id == pipeline.id) && + probability <= rng.gen::<f32>() { // We tend not to close pending pipelines, as that almost always // results in pipelines being closed early in their lifecycle, // and not stressing the constellation as much. @@ -3027,26 +2957,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> } /// Re-send the frame tree to the compositor. - fn update_frame_tree_if_active(&mut self, mut top_level_browsing_context_id: TopLevelBrowsingContextId) { - // This might be a mozbrowser iframe, so we need to climb the parent hierarchy, - // even though it's a top-level browsing context. - // FIXME(paul): to remove once mozbrowser API is removed. - let browsing_context_id = BrowsingContextId::from(top_level_browsing_context_id); - let mut pipeline_id = match self.browsing_contexts.get(&browsing_context_id) { - Some(browsing_context) => browsing_context.pipeline_id, - None => return warn!("Sending frame tree for discarded browsing context {}.", browsing_context_id), - }; - - while let Some(pipeline) = self.pipelines.get(&pipeline_id) { - match pipeline.parent_info { - Some((parent_id, _)) => pipeline_id = parent_id, - None => { - top_level_browsing_context_id = pipeline.top_level_browsing_context_id; - break; - }, - } - } - + fn update_frame_tree_if_active(&mut self, top_level_browsing_context_id: TopLevelBrowsingContextId) { // Only send the frame tree if it's the active one or if no frame tree // has been sent yet. if self.active_browser_id.is_none() || Some(top_level_browsing_context_id) == self.active_browser_id { @@ -3069,77 +2980,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> } } - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowserlocationchange - // Note that this is a no-op if the pipeline is not a mozbrowser iframe - fn trigger_mozbrowserlocationchange(&self, - top_level_browsing_context_id: TopLevelBrowsingContextId) - { - let browsing_context_id = BrowsingContextId::from(top_level_browsing_context_id); - let pipeline_id = match self.browsing_contexts.get(&browsing_context_id) { - Some(browsing_context) => browsing_context.pipeline_id, - None => return warn!("mozbrowser location change on closed browsing context {}.", browsing_context_id), - }; - let (url, parent_info) = match self.pipelines.get(&pipeline_id) { - Some(pipeline) => (pipeline.url.clone(), pipeline.parent_info), - None => return warn!("mozbrowser location change on closed pipeline {}.", pipeline_id), - }; - let parent_id = match parent_info { - Some((parent_id, FrameType::MozBrowserIFrame)) => parent_id, - _ => return debug!("mozbrowser location change on a regular iframe {}", browsing_context_id), - }; - let can_go_forward = !self.joint_session_future_is_empty(top_level_browsing_context_id); - let can_go_back = !self.joint_session_past_is_empty(top_level_browsing_context_id); - let event = MozBrowserEvent::LocationChange(url.to_string(), can_go_back, can_go_forward); - match self.pipelines.get(&parent_id) { - Some(parent) => parent.trigger_mozbrowser_event(Some(top_level_browsing_context_id), event), - None => return warn!("mozbrowser location change on closed parent {}", parent_id), - }; - } - - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowsererror - fn trigger_mozbrowsererror(&mut self, - top_level_browsing_context_id: TopLevelBrowsingContextId, - reason: String, - backtrace: Option<String>) - { - if !PREFS.is_mozbrowser_enabled() { return; } - - let mut report = String::new(); - for (thread_name, warning) in self.handled_warnings.drain(..) { - report.push_str("\nWARNING: "); - if let Some(thread_name) = thread_name { - report.push_str("<"); - report.push_str(&*thread_name); - report.push_str(">: "); - } - report.push_str(&*warning); - } - report.push_str("\nERROR: "); - report.push_str(&*reason); - if let Some(backtrace) = backtrace { - report.push_str("\n\n"); - report.push_str(&*backtrace); - } - - let event = MozBrowserEvent::Error(MozBrowserErrorType::Fatal, reason, report); - let browsing_context_id = BrowsingContextId::from(top_level_browsing_context_id); - let pipeline_id = match self.browsing_contexts.get(&browsing_context_id) { - Some(browsing_context) => browsing_context.pipeline_id, - None => return warn!("Mozbrowser error after top-level browsing context closed."), - }; - let parent_id = match self.pipelines.get(&pipeline_id) { - Some(pipeline) => match pipeline.parent_info { - Some((parent_id, FrameType::MozBrowserIFrame)) => parent_id, - _ => return pipeline.trigger_mozbrowser_event(None, event), - }, - None => return warn!("Mozbrowser error on a closed pipeline {}", pipeline_id), - }; - match self.pipelines.get(&parent_id) { - None => warn!("Mozbrowser error after parent pipeline {} closed.", parent_id), - Some(parent) => parent.trigger_mozbrowser_event(Some(top_level_browsing_context_id), event), - }; - } - fn focused_pipeline_is_descendant_of(&self, browsing_context_id: BrowsingContextId) -> bool { self.focus_pipeline_id.map_or(false, |pipeline_id| { self.fully_active_descendant_browsing_contexts_iter(browsing_context_id) diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs index 00b3088a3fc..4753f0ba3eb 100644 --- a/components/constellation/pipeline.rs +++ b/components/constellation/pipeline.rs @@ -16,7 +16,7 @@ use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use ipc_channel::router::ROUTER; use layout_traits::LayoutThreadFactory; use metrics::PaintTimeMetrics; -use msg::constellation_msg::{BrowsingContextId, TopLevelBrowsingContextId, FrameType, PipelineId, PipelineNamespaceId}; +use msg::constellation_msg::{BrowsingContextId, TopLevelBrowsingContextId, PipelineId, PipelineNamespaceId}; use net::image_cache::ImageCacheImpl; use net_traits::{IpcSend, ResourceThreads}; use net_traits::image_cache::ImageCache; @@ -24,7 +24,7 @@ use profile_traits::mem as profile_mem; use profile_traits::time; use script_traits::{ConstellationControlMsg, DiscardBrowsingContext, ScriptToConstellationChan}; use script_traits::{DocumentActivity, InitialScriptState}; -use script_traits::{LayoutControlMsg, LayoutMsg, LoadData, MozBrowserEvent}; +use script_traits::{LayoutControlMsg, LayoutMsg, LoadData}; use script_traits::{NewLayoutInfo, SWManagerMsg, SWManagerSenders}; use script_traits::{ScriptThreadFactory, TimerSchedulerMsg, WindowSizeData}; use servo_config::opts::{self, Opts}; @@ -58,11 +58,8 @@ pub struct Pipeline { pub top_level_browsing_context_id: TopLevelBrowsingContextId, /// The parent pipeline of this one. `None` if this is a root pipeline. - /// Note that because of mozbrowser iframes, even top-level pipelines - /// may have a parent (in which case the frame type will be - /// `MozbrowserIFrame`). /// TODO: move this field to `BrowsingContext`. - pub parent_info: Option<(PipelineId, FrameType)>, + pub parent_info: Option<PipelineId>, /// The event loop handling this pipeline. pub event_loop: Rc<EventLoop>, @@ -110,7 +107,7 @@ pub struct InitialPipelineState { /// The ID of the parent pipeline and frame type, if any. /// If `None`, this is the root. - pub parent_info: Option<(PipelineId, FrameType)>, + pub parent_info: Option<PipelineId>, /// A channel to the associated constellation. pub script_to_constellation_chan: ScriptToConstellationChan, @@ -309,7 +306,7 @@ impl Pipeline { pub fn new(id: PipelineId, browsing_context_id: BrowsingContextId, top_level_browsing_context_id: TopLevelBrowsingContextId, - parent_info: Option<(PipelineId, FrameType)>, + parent_info: Option<PipelineId>, event_loop: Rc<EventLoop>, layout_chan: IpcSender<LayoutControlMsg>, compositor_proxy: CompositorProxy, @@ -405,22 +402,6 @@ impl Pipeline { }; } - /// Send a mozbrowser event to the script thread for this pipeline. - /// This will cause an event to be fired on an iframe in the document, - /// or on the `Window` if no frame is given. - pub fn trigger_mozbrowser_event(&self, - child_id: Option<TopLevelBrowsingContextId>, - event: MozBrowserEvent) { - assert!(PREFS.is_mozbrowser_enabled()); - - let event = ConstellationControlMsg::MozBrowserEvent(self.id, - child_id, - event); - if let Err(e) = self.event_loop.send(event) { - warn!("Sending mozbrowser event to script failed ({}).", e); - } - } - /// Notify the script thread that this pipeline is visible. fn notify_visibility(&self) { let script_msg = ConstellationControlMsg::ChangeFrameVisibilityStatus(self.id, self.visible); @@ -451,7 +432,7 @@ pub struct UnprivilegedPipelineContent { id: PipelineId, top_level_browsing_context_id: TopLevelBrowsingContextId, browsing_context_id: BrowsingContextId, - parent_info: Option<(PipelineId, FrameType)>, + parent_info: Option<PipelineId>, script_to_constellation_chan: ScriptToConstellationChan, layout_to_constellation_chan: IpcSender<LayoutMsg>, scheduler_chan: IpcSender<TimerSchedulerMsg>, diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index 6f9e89036a2..398b5ace73e 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -365,10 +365,3 @@ pub const TEST_BROWSING_CONTEXT_INDEX: BrowsingContextIndex = #[cfg(feature = "unstable")] pub const TEST_BROWSING_CONTEXT_ID: BrowsingContextId = BrowsingContextId { namespace_id: TEST_NAMESPACE, index: TEST_BROWSING_CONTEXT_INDEX }; - -#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, MallocSizeOf, PartialEq, Serialize)] -pub enum FrameType { - IFrame, - MozBrowserIFrame, -} - diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 4aae00f551b..cd33e982e7c 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -67,7 +67,6 @@ msg = {path = "../msg"} net_traits = {path = "../net_traits"} num-traits = "0.1.32" offscreen_gl_context = { version = "0.14", features = ["serde"] } -open = "1.1.1" parking_lot = "0.4" phf = "0.7.18" profile_traits = {path = "../profile_traits"} diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index a22765395b9..5153b70e72f 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -63,7 +63,7 @@ use js::jsapi::{GCTraceKindToAscii, Heap, JSObject, JSTracer, TraceKind}; use js::jsval::JSVal; use js::rust::Runtime; use metrics::{InteractiveMetrics, InteractiveWindow}; -use msg::constellation_msg::{BrowsingContextId, FrameType, PipelineId, TopLevelBrowsingContextId}; +use msg::constellation_msg::{BrowsingContextId, PipelineId, TopLevelBrowsingContextId}; use net_traits::{Metadata, NetworkError, ReferrerPolicy, ResourceThreads}; use net_traits::filemanager_thread::RelativePos; use net_traits::image::base::{Image, ImageMetadata}; @@ -351,7 +351,7 @@ unsafe_no_jsmanaged_fields!(PropertyDeclarationBlock); // These three are interdependent, if you plan to put jsmanaged data // in one of these make sure it is propagated properly to containing structs unsafe_no_jsmanaged_fields!(DocumentActivity, WindowSizeData, WindowSizeType); -unsafe_no_jsmanaged_fields!(BrowsingContextId, FrameType, PipelineId, TopLevelBrowsingContextId); +unsafe_no_jsmanaged_fields!(BrowsingContextId, PipelineId, TopLevelBrowsingContextId); unsafe_no_jsmanaged_fields!(TimerEventId, TimerSource); unsafe_no_jsmanaged_fields!(TimelineMarkerType); unsafe_no_jsmanaged_fields!(WorkerId); diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index e148b939afc..47ba21c8e4d 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -98,7 +98,7 @@ use js::jsapi::{JSContext, JSObject, JSRuntime}; use js::jsapi::JS_GetRuntime; use metrics::{InteractiveFlag, InteractiveMetrics, InteractiveWindow, ProfilerMetadataFactory, ProgressiveWebMetric}; use mime::{Mime, TopLevel, SubLevel}; -use msg::constellation_msg::{BrowsingContextId, Key, KeyModifiers, KeyState, TopLevelBrowsingContextId}; +use msg::constellation_msg::{BrowsingContextId, Key, KeyModifiers, KeyState}; use net_traits::{FetchResponseMsg, IpcSend, ReferrerPolicy}; use net_traits::CookieSource::NonHTTP; use net_traits::CoreResourceMsg::{GetCookiesForUrl, SetCookiesForUrl}; @@ -111,7 +111,7 @@ use script_layout_interface::message::{Msg, NodesFromPointQueryType, ReflowGoal} use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory}; use script_thread::{MainThreadScriptMsg, ScriptThread}; use script_traits::{AnimationState, DocumentActivity, MouseButton, MouseEventType}; -use script_traits::{MozBrowserEvent, MsDuration, ScriptMsg, TouchEventType, TouchId, UntrustedNodeAddress}; +use script_traits::{MsDuration, ScriptMsg, TouchEventType, TouchId, UntrustedNodeAddress}; use servo_arc::Arc; use servo_atoms::Atom; use servo_config::prefs::PREFS; @@ -451,7 +451,6 @@ impl Document { pub fn set_https_state(&self, https_state: HttpsState) { self.https_state.set(https_state); - self.trigger_mozbrowser_event(MozBrowserEvent::SecurityChange(https_state)); } pub fn is_fully_active(&self) -> bool { @@ -754,13 +753,9 @@ impl Document { pub fn set_ready_state(&self, state: DocumentReadyState) { match state { DocumentReadyState::Loading => { - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowserconnected - self.trigger_mozbrowser_event(MozBrowserEvent::Connected); update_with_current_time_ms(&self.dom_loading); }, DocumentReadyState::Complete => { - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowserloadend - self.trigger_mozbrowser_event(MozBrowserEvent::LoadEnd); update_with_current_time_ms(&self.dom_complete); }, DocumentReadyState::Interactive => update_with_current_time_ms(&self.dom_interactive), @@ -826,9 +821,6 @@ impl Document { /// Handles any updates when the document's title has changed. pub fn title_changed(&self) { if self.browsing_context().is_some() { - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowsertitlechange - self.trigger_mozbrowser_event(MozBrowserEvent::TitleChange(String::from(self.Title()))); - self.send_title_to_constellation(); } } @@ -1410,15 +1402,6 @@ impl Document { } } - pub fn trigger_mozbrowser_event(&self, event: MozBrowserEvent) { - if PREFS.is_mozbrowser_enabled() { - if let Some((parent_pipeline_id, _)) = self.window.parent_info() { - let event = ScriptMsg::MozBrowserEvent(parent_pipeline_id, event); - self.send_to_constellation(event); - } - } - } - /// <https://html.spec.whatwg.org/multipage/#dom-window-requestanimationframe> pub fn request_animation_frame(&self, callback: AnimationFrameCallback) -> u32 { let ident = self.animation_frame_ident.get() + 1; @@ -1857,20 +1840,6 @@ impl Document { .find(|node| node.browsing_context_id() == Some(browsing_context_id)) } - /// Find a mozbrowser iframe element in the document. - pub fn find_mozbrowser_iframe(&self, - top_level_browsing_context_id: TopLevelBrowsingContextId) - -> Option<DomRoot<HTMLIFrameElement>> - { - match self.find_iframe(BrowsingContextId::from(top_level_browsing_context_id)) { - None => None, - Some(iframe) => { - assert!(iframe.Mozbrowser()); - Some(iframe) - }, - } - } - pub fn get_dom_loading(&self) -> u64 { self.dom_loading.get() } diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index 37949572ccc..e48385ed692 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -28,8 +28,6 @@ use dom_struct::dom_struct; use html5ever::{LocalName, Prefix}; use net_traits::ReferrerPolicy; use num_traits::ToPrimitive; -use script_traits::MozBrowserEvent; -use servo_config::prefs::PREFS; use servo_url::ServoUrl; use std::default::Default; use style::attr::AttrValue; @@ -608,13 +606,8 @@ pub fn follow_hyperlink(subject: &Element, hyperlink_suffix: Option<String>, ref // Step 8: navigate to the URL. if let Some(target) = target { - if PREFS.is_mozbrowser_enabled() && !is_current_browsing_context(target.Value()) { - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowseropenwindow - // TODO: referrer and opener - // TODO: should we send the normalized url or the non-normalized href? - let event = MozBrowserEvent::OpenWindow(url.into_string(), Some(String::from(target.Value())), None); - document.trigger_mozbrowser_event(event); - return + if !is_current_browsing_context(target.Value()) { + // https://github.com/servo/servo/issues/13241 } } diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index c1ec4a7435b..b03cfdce07e 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -5,51 +5,34 @@ use document_loader::{LoadBlocker, LoadType}; use dom::attr::Attr; use dom::bindings::cell::DomRefCell; -use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementErrorEventDetail; -use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementIconChangeEventDetail; -use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementLocationChangeEventDetail; -use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementOpenTabEventDetail; -use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementOpenWindowEventDetail; -use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementSecurityChangeDetail; -use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementVisibilityChangeEventDetail; -use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserShowModalPromptEventDetail; use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding; use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods; use dom::bindings::codegen::Bindings::WindowBinding::WindowBinding::WindowMethods; -use dom::bindings::conversions::ToJSValConvertible; -use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::inheritance::Castable; use dom::bindings::refcounted::Trusted; use dom::bindings::reflector::DomObject; use dom::bindings::root::{LayoutDom, DomRoot, MutNullableDom}; use dom::bindings::str::DOMString; -use dom::customevent::CustomEvent; use dom::document::Document; use dom::domtokenlist::DOMTokenList; use dom::element::{AttributeMutation, Element, RawLayoutElementHelpers}; -use dom::event::Event; use dom::eventtarget::EventTarget; use dom::globalscope::GlobalScope; use dom::htmlelement::HTMLElement; use dom::node::{Node, NodeDamage, UnbindContext, document_from_node, window_from_node}; use dom::virtualmethods::VirtualMethods; -use dom::window::{ReflowReason, Window}; +use dom::window::ReflowReason; use dom::windowproxy::WindowProxy; use dom_struct::dom_struct; use html5ever::{LocalName, Prefix}; use ipc_channel::ipc; -use js::jsapi::{JSAutoCompartment, JSContext, MutableHandleValue}; -use js::jsval::{NullValue, UndefinedValue}; -use msg::constellation_msg::{FrameType, BrowsingContextId, PipelineId, TopLevelBrowsingContextId, TraversalDirection}; -use net_traits::response::HttpsState; +use msg::constellation_msg::{BrowsingContextId, PipelineId, TopLevelBrowsingContextId}; use script_layout_interface::message::ReflowGoal; use script_thread::ScriptThread; use script_traits::{IFrameLoadInfo, IFrameLoadInfoWithData, JsEvalResult, LoadData, UpdatePipelineIdReason}; -use script_traits::{MozBrowserEvent, NewLayoutInfo, ScriptMsg}; +use script_traits::{NewLayoutInfo, ScriptMsg}; use script_traits::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed}; -use servo_atoms::Atom; use servo_config::prefs::PREFS; -use servo_config::servo_version; use servo_url::ServoUrl; use std::cell::Cell; use style::attr::{AttrValue, LengthOrPercentageOrAuto}; @@ -165,8 +148,6 @@ impl HTMLIFrameElement { let old_pipeline_id = self.pipeline_id(); let new_pipeline_id = PipelineId::new(); self.pending_pipeline_id.set(Some(new_pipeline_id)); - let private_iframe = self.privatebrowsing(); - let frame_type = if self.Mozbrowser() { FrameType::MozBrowserIFrame } else { FrameType::IFrame }; let global_scope = window.upcast::<GlobalScope>(); let load_info = IFrameLoadInfo { @@ -174,8 +155,7 @@ impl HTMLIFrameElement { browsing_context_id: browsing_context_id, top_level_browsing_context_id: top_level_browsing_context_id, new_pipeline_id: new_pipeline_id, - is_private: private_iframe, - frame_type: frame_type, + is_private: false, // FIXME replace: replace, }; @@ -189,7 +169,7 @@ impl HTMLIFrameElement { .unwrap(); let new_layout_info = NewLayoutInfo { - parent_info: Some((global_scope.pipeline_id(), frame_type)), + parent_info: Some(global_scope.pipeline_id()), new_pipeline_id: new_pipeline_id, browsing_context_id: browsing_context_id, top_level_browsing_context_id: top_level_browsing_context_id, @@ -216,11 +196,6 @@ impl HTMLIFrameElement { .unwrap(); } } - - if PREFS.is_mozbrowser_enabled() { - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowserloadstart - self.dispatch_mozbrowser_event(MozBrowserEvent::LoadStart); - } } /// <https://html.spec.whatwg.org/multipage/#process-the-iframe-attributes> @@ -258,17 +233,6 @@ impl HTMLIFrameElement { self.navigate_or_reload_child_browsing_context(Some(load_data), NavigationType::Regular, false); } - #[allow(unsafe_code)] - pub fn dispatch_mozbrowser_event(&self, event: MozBrowserEvent) { - assert!(PREFS.is_mozbrowser_enabled()); - - if self.Mozbrowser() { - let window = window_from_node(self); - let custom_event = build_mozbrowser_custom_event(&window, event); - custom_event.upcast::<Event>().fire(self.upcast()); - } - } - fn create_nested_browsing_context(&self) { // Synchronously create a new context and navigate it to about:blank. let url = ServoUrl::parse("about:blank").unwrap(); @@ -276,12 +240,8 @@ impl HTMLIFrameElement { let window = window_from_node(self); let pipeline_id = Some(window.upcast::<GlobalScope>().pipeline_id()); let load_data = LoadData::new(url, pipeline_id, document.get_referrer_policy(), Some(document.url().clone())); - let (browsing_context_id, top_level_browsing_context_id) = if self.Mozbrowser() { - let top_level_browsing_context_id = TopLevelBrowsingContextId::new(); - (BrowsingContextId::from(top_level_browsing_context_id), top_level_browsing_context_id) - } else { - (BrowsingContextId::new(), window.window_proxy().top_level_browsing_context_id()) - }; + let browsing_context_id = BrowsingContextId::new(); + let top_level_browsing_context_id = window.window_proxy().top_level_browsing_context_id(); self.pipeline_id.set(None); self.pending_pipeline_id.set(None); self.top_level_browsing_context_id.set(Some(top_level_browsing_context_id)); @@ -358,11 +318,6 @@ impl HTMLIFrameElement { pub fn change_visibility_status(&self, visibility: bool) { if self.visibility.get() != visibility { self.visibility.set(visibility); - - // Visibility changes are only exposed to Mozbrowser iframes - if self.Mozbrowser() { - self.dispatch_mozbrowser_event(MozBrowserEvent::VisibilityChange(visibility)); - } } } @@ -395,16 +350,6 @@ impl HTMLIFrameElement { let window = window_from_node(self); window.reflow(ReflowGoal::Full, ReflowReason::IFrameLoadEvent); } - - /// Check whether the iframe has the mozprivatebrowsing attribute set - pub fn privatebrowsing(&self) -> bool { - if self.Mozbrowser() { - let element = self.upcast::<Element>(); - element.has_attribute(&LocalName::from("mozprivatebrowsing")) - } else { - false - } - } } pub trait HTMLIFrameElementLayoutMethods { @@ -455,117 +400,6 @@ impl HTMLIFrameElementLayoutMethods for LayoutDom<HTMLIFrameElement> { } } -#[allow(unsafe_code)] -pub fn build_mozbrowser_custom_event(window: &Window, event: MozBrowserEvent) -> DomRoot<CustomEvent> { - // TODO(gw): Support mozbrowser event types that have detail which is not a string. - // See https://developer.mozilla.org/en-US/docs/Web/API/Using_the_Browser_API - // for a list of mozbrowser events. - let cx = window.get_cx(); - let _ac = JSAutoCompartment::new(cx, window.reflector().get_jsobject().get()); - rooted!(in(cx) let mut detail = UndefinedValue()); - let event_name = Atom::from(event.name()); - unsafe { build_mozbrowser_event_detail(event, cx, detail.handle_mut()); } - CustomEvent::new(window.upcast(), - event_name, - true, - true, - detail.handle()) -} - -#[allow(unsafe_code)] -unsafe fn build_mozbrowser_event_detail(event: MozBrowserEvent, - cx: *mut JSContext, - rval: MutableHandleValue) { - match event { - MozBrowserEvent::AsyncScroll | MozBrowserEvent::Close | MozBrowserEvent::ContextMenu | - MozBrowserEvent::LoadEnd | MozBrowserEvent::LoadStart | - MozBrowserEvent::Connected | MozBrowserEvent::OpenSearch | - MozBrowserEvent::UsernameAndPasswordRequired => { - rval.set(NullValue()); - } - MozBrowserEvent::Error(error_type, description, report) => { - BrowserElementErrorEventDetail { - type_: Some(DOMString::from(error_type.name())), - description: Some(DOMString::from(description)), - report: Some(DOMString::from(report)), - version: Some(DOMString::from_string(servo_version())), - }.to_jsval(cx, rval); - }, - MozBrowserEvent::SecurityChange(https_state) => { - BrowserElementSecurityChangeDetail { - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowsersecuritychange - state: Some(DOMString::from(match https_state { - HttpsState::Modern => "secure", - HttpsState::Deprecated => "broken", - HttpsState::None => "insecure", - }.to_owned())), - // FIXME - Not supported yet: - trackingContent: None, - mixedContent: None, - trackingState: None, - extendedValidation: None, - mixedState: None, - }.to_jsval(cx, rval); - } - MozBrowserEvent::TitleChange(ref string) => { - string.to_jsval(cx, rval); - } - MozBrowserEvent::LocationChange(url, can_go_back, can_go_forward) => { - BrowserElementLocationChangeEventDetail { - url: Some(DOMString::from(url)), - canGoBack: Some(can_go_back), - canGoForward: Some(can_go_forward), - }.to_jsval(cx, rval); - } - MozBrowserEvent::OpenTab(url) => { - BrowserElementOpenTabEventDetail { - url: Some(DOMString::from(url)), - }.to_jsval(cx, rval); - } - MozBrowserEvent::OpenWindow(url, target, features) => { - BrowserElementOpenWindowEventDetail { - url: Some(DOMString::from(url)), - target: target.map(DOMString::from), - features: features.map(DOMString::from), - }.to_jsval(cx, rval); - } - MozBrowserEvent::IconChange(rel, href, sizes) => { - BrowserElementIconChangeEventDetail { - rel: Some(DOMString::from(rel)), - href: Some(DOMString::from(href)), - sizes: Some(DOMString::from(sizes)), - }.to_jsval(cx, rval); - } - MozBrowserEvent::ShowModalPrompt(prompt_type, title, message, return_value) => { - BrowserShowModalPromptEventDetail { - promptType: Some(DOMString::from(prompt_type)), - title: Some(DOMString::from(title)), - message: Some(DOMString::from(message)), - returnValue: Some(DOMString::from(return_value)), - }.to_jsval(cx, rval) - } - MozBrowserEvent::VisibilityChange(visibility) => { - BrowserElementVisibilityChangeEventDetail { - visible: Some(visibility), - }.to_jsval(cx, rval); - } - } -} - -pub fn Navigate(iframe: &HTMLIFrameElement, direction: TraversalDirection) -> ErrorResult { - if iframe.Mozbrowser() { - if let Some(_) = iframe.top_level_browsing_context_id() { - let window = window_from_node(iframe); - let msg = ScriptMsg::TraverseHistory(direction); - window.upcast::<GlobalScope>().script_to_constellation_chan().send(msg).unwrap(); - return Ok(()); - } - } - debug!(concat!("this frame is not mozbrowser: mozbrowser attribute missing, or not a top", - "level window, or mozbrowser preference not set (use --pref dom.mozbrowser.enabled)")); - Err(Error::NotSupported) -} - impl HTMLIFrameElementMethods for HTMLIFrameElement { // https://html.spec.whatwg.org/multipage/#dom-iframe-src make_url_getter!(Src, "src"); @@ -604,83 +438,11 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement { Some(document) } - // Experimental mozbrowser implementation is based on the webidl - // present in the gecko source tree, and the documentation here: - // https://developer.mozilla.org/en-US/docs/Web/API/Using_the_Browser_API - // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#attr-mozbrowser - fn Mozbrowser(&self) -> bool { - if window_from_node(self).is_mozbrowser() { - let element = self.upcast::<Element>(); - element.has_attribute(&local_name!("mozbrowser")) - } else { - false - } - } - - // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#attr-mozbrowser - fn SetMozbrowser(&self, value: bool) { - let element = self.upcast::<Element>(); - element.set_bool_attribute(&local_name!("mozbrowser"), value); - } - // https://html.spec.whatwg.org/multipage/#attr-iframe-allowfullscreen make_bool_getter!(AllowFullscreen, "allowfullscreen"); // https://html.spec.whatwg.org/multipage/#attr-iframe-allowfullscreen make_bool_setter!(SetAllowFullscreen, "allowfullscreen"); - // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/goBack - fn GoBack(&self) -> ErrorResult { - Navigate(self, TraversalDirection::Back(1)) - } - - // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/goForward - fn GoForward(&self) -> ErrorResult { - Navigate(self, TraversalDirection::Forward(1)) - } - - // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/reload - fn Reload(&self, _hard_reload: bool) -> ErrorResult { - if self.Mozbrowser() { - if self.upcast::<Node>().is_in_doc_with_browsing_context() { - self.navigate_or_reload_child_browsing_context(None, NavigationType::Regular, true); - } - Ok(()) - } else { - debug!(concat!("this frame is not mozbrowser: mozbrowser attribute missing, or not a top", - "level window, or mozbrowser preference not set (use --pref dom.mozbrowser.enabled)")); - Err(Error::NotSupported) - } - } - - // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/setVisible - fn SetVisible(&self, visible: bool) -> ErrorResult { - if self.Mozbrowser() { - self.set_visible(visible); - Ok(()) - } else { - debug!(concat!("this frame is not mozbrowser: mozbrowser attribute missing, or not a top", - "level window, or mozbrowser preference not set (use --pref dom.mozbrowser.enabled)")); - Err(Error::NotSupported) - } - } - - // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/getVisible - fn GetVisible(&self) -> Fallible<bool> { - if self.Mozbrowser() { - Ok(self.visibility.get()) - } else { - debug!(concat!("this frame is not mozbrowser: mozbrowser attribute missing, or not a top", - "level window, or mozbrowser preference not set (use --pref dom.mozbrowser.enabled)")); - Err(Error::NotSupported) - } - } - - - // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/stop - fn Stop(&self) -> ErrorResult { - Err(Error::NotSupported) - } - // https://html.spec.whatwg.org/multipage/#dom-dim-width make_getter!(Width, "width"); // https://html.spec.whatwg.org/multipage/#dom-dim-width @@ -695,21 +457,6 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement { make_getter!(FrameBorder, "frameborder"); // https://html.spec.whatwg.org/multipage/#other-elements,-attributes-and-apis:attr-iframe-frameborder make_setter!(SetFrameBorder, "frameborder"); - - // check-tidy: no specs after this line - fn SetMozprivatebrowsing(&self, value: bool) { - let element = self.upcast::<Element>(); - element.set_bool_attribute(&LocalName::from("mozprivatebrowsing"), value); - } - - fn Mozprivatebrowsing(&self) -> bool { - if window_from_node(self).is_mozbrowser() { - let element = self.upcast::<Element>(); - element.has_attribute(&LocalName::from("mozprivatebrowsing")) - } else { - false - } - } } impl VirtualMethods for HTMLIFrameElement { diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index 597a6e2e96f..be4c974bf67 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -24,7 +24,7 @@ use dom::virtualmethods::VirtualMethods; use dom_struct::dom_struct; use html5ever::{LocalName, Prefix}; use net_traits::ReferrerPolicy; -use script_traits::{MozBrowserEvent, ScriptMsg}; +use script_traits::ScriptMsg; use servo_arc::Arc; use std::borrow::ToOwned; use std::cell::Cell; @@ -309,18 +309,12 @@ impl HTMLLinkElement { }, link_url, cors_setting, integrity_metadata.to_owned()); } - fn handle_favicon_url(&self, rel: &str, href: &str, sizes: &Option<String>) { + fn handle_favicon_url(&self, _rel: &str, href: &str, _sizes: &Option<String>) { let document = document_from_node(self); match document.base_url().join(href) { Ok(url) => { let event = ScriptMsg::NewFavicon(url.clone()); document.window().upcast::<GlobalScope>().script_to_constellation_chan().send(event).unwrap(); - - let mozbrowser_event = match *sizes { - Some(ref sizes) => MozBrowserEvent::IconChange(rel.to_owned(), url.to_string(), sizes.to_owned()), - None => MozBrowserEvent::IconChange(rel.to_owned(), url.to_string(), "".to_owned()) - }; - document.trigger_mozbrowser_event(mozbrowser_event); } Err(e) => debug!("Parsing url {} failed: {}", href, e) } diff --git a/components/script/dom/webidls/BrowserElement.webidl b/components/script/dom/webidls/BrowserElement.webidl deleted file mode 100644 index 4c6273a1cef..00000000000 --- a/components/script/dom/webidls/BrowserElement.webidl +++ /dev/null @@ -1,227 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -// https://developer.mozilla.org/en-US/docs/Web/API/Using_the_Browser_API - -callback BrowserElementNextPaintEventCallback = void (); - -//enum BrowserFindCaseSensitivity { "case-sensitive", "case-insensitive" }; -//enum BrowserFindDirection { "forward", "backward" }; - -//dictionary BrowserElementDownloadOptions { -// DOMString? filename; -// DOMString? referrer; -//}; - -//dictionary BrowserElementExecuteScriptOptions { -// DOMString? url; -// DOMString? origin; -//}; - -[NoInterfaceObject, Exposed=(Window,Worker)] -interface BrowserElement { -}; - -dictionary BrowserElementSecurityChangeDetail { - - // state: - // "insecure" indicates that the data corresponding to - // the request was received over an insecure channel. - // - // "broken" indicates an unknown security state. This - // may mean that the request is being loaded as part - // of a page in which some content was received over - // an insecure channel. - // - // "secure" indicates that the data corresponding to the - // request was received over a secure channel. - DOMString state; - - // trackingState: - // "loaded_tracking_content": tracking content has been loaded. - // "blocked_tracking_content": tracking content has been blocked from loading. - DOMString trackingState; - - // mixedState: - // "blocked_mixed_active_content": Mixed active content has been blocked from loading. - // "loaded_mixed_active_content": Mixed active content has been loaded. - DOMString mixedState; - - boolean extendedValidation; - boolean trackingContent; - boolean mixedContent; -}; - -dictionary BrowserElementErrorEventDetail { - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowsererror - // just requires a "type" field, but we also provide - // an optional human-readable description, and - // an optional machine-readable report (e.g. a backtrace for panics) - DOMString type; - DOMString description; - DOMString report; - DOMString version; -}; - -dictionary BrowserElementLocationChangeEventDetail { - DOMString url; - boolean canGoBack; - boolean canGoForward; -}; - -dictionary BrowserElementIconChangeEventDetail { - DOMString rel; - DOMString href; - DOMString sizes; -}; - -dictionary BrowserShowModalPromptEventDetail { - DOMString promptType; - DOMString title; - DOMString message; - DOMString returnValue; - // TODO(simartin) unblock() callback -}; - -dictionary BrowserElementOpenTabEventDetail { - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowseropentab - DOMString url; -}; - -dictionary BrowserElementOpenWindowEventDetail { - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowseropenwindow - DOMString url; - DOMString target; - DOMString features; - // Element frameElement; -}; - -dictionary BrowserElementVisibilityChangeEventDetail { - boolean visible; -}; - -BrowserElement implements BrowserElementCommon; -BrowserElement implements BrowserElementPrivileged; - -[NoInterfaceObject, Exposed=(Window,Worker)] -interface BrowserElementCommon { - [Throws, - Pref="dom.mozbrowser.enabled"] - void setVisible(boolean visible); - - [Throws, - Pref="dom.mozbrowser.enabled"] - boolean getVisible(); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //void setActive(boolean active); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //boolean getActive(); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //void addNextPaintListener(BrowserElementNextPaintEventCallback listener); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //void removeNextPaintListener(BrowserElementNextPaintEventCallback listener); -}; - -[NoInterfaceObject, Exposed=(Window,Worker)] -interface BrowserElementPrivileged { - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //void sendMouseEvent(DOMString type, - // unsigned long x, - // unsigned long y, - // unsigned long button, - // unsigned long clickCount, - // unsigned long modifiers); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled", - // Func="TouchEvent::PrefEnabled"] - //void sendTouchEvent(DOMString type, - // sequence<unsigned long> identifiers, - // sequence<long> x, - // sequence<long> y, - // sequence<unsigned long> rx, - // sequence<unsigned long> ry, - // sequence<float> rotationAngles, - // sequence<float> forces, - // unsigned long count, - // unsigned long modifiers); - - [Func="::dom::window::Window::global_is_mozbrowser", Throws] - void goBack(); - - [Func="::dom::window::Window::global_is_mozbrowser", Throws] - void goForward(); - - [Func="::dom::window::Window::global_is_mozbrowser", Throws] - void reload(optional boolean hardReload = false); - - [Func="::dom::window::Window::global_is_mozbrowser", Throws] - void stop(); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //DOMRequest download(DOMString url, - // optional BrowserElementDownloadOptions options); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //DOMRequest purgeHistory(); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //DOMRequest getScreenshot([EnforceRange] unsigned long width, - // [EnforceRange] unsigned long height, - // optional DOMString mimeType=""); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //void zoom(float zoom); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //DOMRequest getCanGoBack(); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //DOMRequest getCanGoForward(); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //DOMRequest getContentDimensions(); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //DOMRequest setInputMethodActive(boolean isActive); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //void setNFCFocus(boolean isFocus); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //void findAll(DOMString searchString, BrowserFindCaseSensitivity caseSensitivity); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //void findNext(BrowserFindDirection direction); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //void clearMatch(); - - //[Throws, - // Pref="dom.mozBrowserFramesEnabled"] - //DOMRequest executeScript(DOMString script, - // optional BrowserElementExecuteScriptOptions options); - -}; diff --git a/components/script/dom/webidls/HTMLIFrameElement.webidl b/components/script/dom/webidls/HTMLIFrameElement.webidl index bcccb34cb0a..fec8768e8e8 100644 --- a/components/script/dom/webidls/HTMLIFrameElement.webidl +++ b/components/script/dom/webidls/HTMLIFrameElement.webidl @@ -46,13 +46,3 @@ partial interface HTMLIFrameElement { // [CEReactions, TreatNullAs=EmptyString] // attribute DOMString marginWidth; }; - -partial interface HTMLIFrameElement { - [CEReactions, Func="::dom::window::Window::global_is_mozbrowser"] - attribute boolean mozbrowser; - - [CEReactions, Func="::dom::window::Window::global_is_mozbrowser"] - attribute boolean mozprivatebrowsing; -}; - -HTMLIFrameElement implements BrowserElement; diff --git a/components/script/dom/webidls/Window.webidl b/components/script/dom/webidls/Window.webidl index 0ec0489937b..d6da05480cf 100644 --- a/components/script/dom/webidls/Window.webidl +++ b/components/script/dom/webidls/Window.webidl @@ -164,8 +164,6 @@ partial interface Window { void debug(DOMString arg); void gc(); void trap(); - [Func="Window::global_is_mozbrowser", Throws] - void openURLInDefaultBrowser(DOMString href); }; // WebDriver extensions diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index c92a04c7cd4..96b19784280 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -32,10 +32,8 @@ use dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration, CSSSt use dom::customelementregistry::CustomElementRegistry; use dom::document::{AnimationFrameCallback, Document}; use dom::element::Element; -use dom::event::Event; use dom::globalscope::GlobalScope; use dom::history::History; -use dom::htmliframeelement::build_mozbrowser_custom_event; use dom::location::Location; use dom::mediaquerylist::{MediaQueryList, WeakMediaQueryListVec}; use dom::messageevent::MessageEvent; @@ -54,18 +52,17 @@ use euclid::{Point2D, Vector2D, Rect, Size2D}; use fetch; use ipc_channel::ipc::{self, IpcSender}; use ipc_channel::router::ROUTER; -use js::jsapi::{HandleObject, HandleValue, JSAutoCompartment, JSContext}; +use js::jsapi::{HandleValue, JSAutoCompartment, JSContext}; use js::jsapi::{JS_GC, JS_GetRuntime}; use js::jsval::UndefinedValue; use layout_image::fetch_image_for_layout; use microtask::MicrotaskQueue; -use msg::constellation_msg::{FrameType, PipelineId}; +use msg::constellation_msg::PipelineId; use net_traits::{ResourceThreads, ReferrerPolicy}; use net_traits::image_cache::{ImageCache, ImageResponder, ImageResponse}; use net_traits::image_cache::{PendingImageId, PendingImageResponse}; use net_traits::storage_thread::StorageType; use num_traits::ToPrimitive; -use open; use profile_traits::mem::ProfilerChan as MemProfilerChan; use profile_traits::time::ProfilerChan as TimeProfilerChan; use script_layout_interface::{TrustedNodeAddress, PendingImageState}; @@ -76,14 +73,13 @@ use script_layout_interface::rpc::{NodeScrollIdResponse, ResolvedStyleResponse, use script_runtime::{CommonScriptMsg, ScriptChan, ScriptPort, ScriptThreadEventCategory, Runtime}; use script_thread::{ImageCacheMsg, MainThreadScriptChan, MainThreadScriptMsg}; use script_thread::{ScriptThread, SendableMainThreadScriptChan}; -use script_traits::{ConstellationControlMsg, DocumentState, LoadData, MozBrowserEvent}; +use script_traits::{ConstellationControlMsg, DocumentState, LoadData}; use script_traits::{ScriptToConstellationChan, ScriptMsg, ScrollState, TimerEvent, TimerEventId}; use script_traits::{TimerSchedulerMsg, UntrustedNodeAddress, WindowSizeData, WindowSizeType}; use script_traits::webdriver_msg::{WebDriverJSError, WebDriverJSResult}; use selectors::attr::CaseSensitivity; use servo_arc; use servo_config::opts; -use servo_config::prefs::PREFS; use servo_geometry::{f32_rect_to_au_rect, MaxRect}; use servo_url::{Host, MutableOrigin, ImmutableOrigin, ServoUrl}; use std::borrow::ToOwned; @@ -200,7 +196,7 @@ pub struct Window { resize_event: Cell<Option<(WindowSizeData, WindowSizeType)>>, /// Parent id associated with this page, if any. - parent_info: Option<(PipelineId, FrameType)>, + parent_info: Option<PipelineId>, /// Global static data related to the DOM. dom_static: GlobalStaticData, @@ -343,7 +339,7 @@ impl Window { &self.script_chan.0 } - pub fn parent_info(&self) -> Option<(PipelineId, FrameType)> { + pub fn parent_info(&self) -> Option<PipelineId> { self.parent_info } @@ -520,7 +516,7 @@ impl WindowMethods for Window { // https://html.spec.whatwg.org/multipage/#dom-alert fn Alert(&self, s: DOMString) { - // Right now, just print to the console + // Print to the console. // Ensure that stderr doesn't trample through the alert() we use to // communicate test results (see executorservo.py in wptrunner). { @@ -992,17 +988,6 @@ impl WindowMethods for Window { *self.status.borrow_mut() = status } - // check-tidy: no specs after this line - fn OpenURLInDefaultBrowser(&self, href: DOMString) -> ErrorResult { - let url = ServoUrl::parse(&href).map_err(|e| { - Error::Type(format!("Couldn't parse URL: {}", e)) - })?; - match open::that(url.as_str()) { - Ok(_) => Ok(()), - Err(e) => Err(Error::Type(format!("Couldn't open URL: {}", e))), - } - } - // https://drafts.csswg.org/cssom-view/#dom-window-matchmedia fn MatchMedia(&self, query: DOMString) -> DomRoot<MediaQueryList> { let mut input = ParserInput::new(&query); @@ -1682,31 +1667,7 @@ impl Window { // https://html.spec.whatwg.org/multipage/#top-level-browsing-context pub fn is_top_level(&self) -> bool { - match self.parent_info { - Some((_, FrameType::IFrame)) => false, - _ => true, - } - } - - /// Returns whether this window is mozbrowser. - pub fn is_mozbrowser(&self) -> bool { - PREFS.is_mozbrowser_enabled() && self.parent_info().is_none() - } - - /// Returns whether mozbrowser is enabled and `obj` has been created - /// in a top-level `Window` global. - #[allow(unsafe_code)] - pub unsafe fn global_is_mozbrowser(_: *mut JSContext, obj: HandleObject) -> bool { - GlobalScope::from_object(obj.get()) - .downcast::<Window>() - .map_or(false, |window| window.is_mozbrowser()) - } - - #[allow(unsafe_code)] - pub fn dispatch_mozbrowser_event(&self, event: MozBrowserEvent) { - assert!(PREFS.is_mozbrowser_enabled()); - let custom_event = build_mozbrowser_custom_event(&self, event); - custom_event.upcast::<Event>().fire(self.upcast()); + self.parent_info.is_none() } pub fn evaluate_media_queries_and_report_changes(&self) { @@ -1769,7 +1730,7 @@ impl Window { timer_event_chan: IpcSender<TimerEvent>, layout_chan: Sender<Msg>, pipelineid: PipelineId, - parent_info: Option<(PipelineId, FrameType)>, + parent_info: Option<PipelineId>, window_size: Option<WindowSizeData>, origin: MutableOrigin, navigation_start: u64, diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 33c62a38cd5..b7b652a6f91 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -60,7 +60,6 @@ use net_traits::trim_http_whitespace; use network_listener::{NetworkListener, PreInvoke}; use script_traits::DocumentActivity; use servo_atoms::Atom; -use servo_config::prefs::PREFS; use servo_url::ServoUrl; use std::borrow::ToOwned; use std::cell::Cell; @@ -572,20 +571,6 @@ impl XMLHttpRequestMethods for XMLHttpRequest { unreachable!() }; - let bypass_cross_origin_check = { - // We want to be able to do cross-origin requests in browser.html. - // If the XHR happens in a top level window and the mozbrowser - // preference is enabled, we allow bypassing the CORS check. - // This is a temporary measure until we figure out Servo privilege - // story. See https://github.com/servo/servo/issues/9582 - if let Some(win) = DomRoot::downcast::<Window>(self.global()) { - let is_root_pipeline = win.parent_info().is_none(); - is_root_pipeline && PREFS.is_mozbrowser_enabled() - } else { - false - } - }; - let mut request = RequestInit { method: self.request_method.borrow().clone(), url: self.request_url.borrow().clone().unwrap(), @@ -608,10 +593,6 @@ impl XMLHttpRequestMethods for XMLHttpRequest { .. RequestInit::default() }; - if bypass_cross_origin_check { - request.mode = RequestMode::Navigate; - } - // step 4 (second half) match extracted_or_serialized { Some((_, ref content_type)) => { diff --git a/components/script/lib.rs b/components/script/lib.rs index a871b320758..e28bf016e55 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -70,7 +70,6 @@ extern crate msg; extern crate net_traits; extern crate num_traits; extern crate offscreen_gl_context; -extern crate open; extern crate parking_lot; extern crate phf; #[macro_use] diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 5cfa02d2974..3a51c812dce 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -77,7 +77,7 @@ use malloc_size_of::MallocSizeOfOps; use mem::malloc_size_of_including_self; use metrics::{MAX_TASK_NS, PaintTimeMetrics}; use microtask::{MicrotaskQueue, Microtask}; -use msg::constellation_msg::{BrowsingContextId, FrameType, PipelineId, PipelineNamespace, TopLevelBrowsingContextId}; +use msg::constellation_msg::{BrowsingContextId, PipelineId, PipelineNamespace, TopLevelBrowsingContextId}; use net_traits::{FetchMetadata, FetchResponseListener, FetchResponseMsg}; use net_traits::{Metadata, NetworkError, ReferrerPolicy, ResourceThreads}; use net_traits::image_cache::{ImageCache, PendingImageResponse}; @@ -91,7 +91,7 @@ use script_runtime::{ScriptPort, get_reports, new_rt_and_cx, Runtime}; use script_traits::{CompositorEvent, ConstellationControlMsg}; use script_traits::{DiscardBrowsingContext, DocumentActivity, EventResult}; use script_traits::{InitialScriptState, JsEvalResult, LayoutMsg, LoadData}; -use script_traits::{MouseButton, MouseEventType, MozBrowserEvent, NewLayoutInfo}; +use script_traits::{MouseButton, MouseEventType, NewLayoutInfo}; use script_traits::{ProgressiveWebMetricType, Painter, ScriptMsg, ScriptThreadFactory}; use script_traits::{ScriptToConstellationChan, TimerEvent, TimerSchedulerMsg}; use script_traits::{TimerSource, TouchEventType, TouchId, UntrustedNodeAddress}; @@ -153,7 +153,7 @@ struct InProgressLoad { /// The top level ancestor browsing context. top_level_browsing_context_id: TopLevelBrowsingContextId, /// The parent pipeline and frame type associated with this load, if any. - parent_info: Option<(PipelineId, FrameType)>, + parent_info: Option<PipelineId>, /// The current window size associated with this pipeline. window_size: Option<WindowSizeData>, /// Channel to the layout thread associated with this pipeline. @@ -179,7 +179,7 @@ impl InProgressLoad { fn new(id: PipelineId, browsing_context_id: BrowsingContextId, top_level_browsing_context_id: TopLevelBrowsingContextId, - parent_info: Option<(PipelineId, FrameType)>, + parent_info: Option<PipelineId>, layout_chan: Sender<message::Msg>, window_size: Option<WindowSizeData>, url: ServoUrl, @@ -980,7 +980,7 @@ impl ScriptThread { let origin = if new_layout_info.load_data.url.as_str() != "about:blank" { MutableOrigin::new(new_layout_info.load_data.url.origin()) } else if let Some(parent) = new_layout_info.parent_info - .and_then(|(pipeline_id, _)| self.documents.borrow() + .and_then(|pipeline_id| self.documents.borrow() .find_document(pipeline_id)) { parent.origin().clone() } else if let Some(creator) = new_layout_info.load_data.creator_pipeline_id @@ -1168,7 +1168,6 @@ impl ScriptThread { NotifyVisibilityChange(id, ..) => Some(id), Navigate(id, ..) => Some(id), PostMessage(id, ..) => Some(id), - MozBrowserEvent(id, ..) => Some(id), UpdatePipelineId(_, _, id, _) => Some(id), FocusIFrame(id, ..) => Some(id), WebDriverScriptCommand(id, ..) => Some(id), @@ -1288,12 +1287,6 @@ impl ScriptThread { self.handle_visibility_change_complete_msg(parent_pipeline_id, browsing_context_id, visible), ConstellationControlMsg::PostMessage(pipeline_id, origin, data) => self.handle_post_message_msg(pipeline_id, origin, data), - ConstellationControlMsg::MozBrowserEvent(parent_pipeline_id, - top_level_browsing_context_id, - event) => - self.handle_mozbrowser_event_msg(parent_pipeline_id, - top_level_browsing_context_id, - event), ConstellationControlMsg::UpdatePipelineId(parent_pipeline_id, browsing_context_id, new_pipeline_id, @@ -1692,27 +1685,6 @@ impl ScriptThread { } } - /// Handles a mozbrowser event, for example see: - /// <https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowserloadstart> - fn handle_mozbrowser_event_msg(&self, - parent_pipeline_id: PipelineId, - top_level_browsing_context_id: Option<TopLevelBrowsingContextId>, - event: MozBrowserEvent) { - let doc = match { self.documents.borrow().find_document(parent_pipeline_id) } { - None => return warn!("Mozbrowser event after pipeline {} closed.", parent_pipeline_id), - Some(doc) => doc, - }; - - match top_level_browsing_context_id { - None => doc.window().dispatch_mozbrowser_event(event), - Some(top_level_browsing_context_id) => match doc.find_mozbrowser_iframe(top_level_browsing_context_id) { - None => warn!("Mozbrowser event after iframe {}/{} closed.", - parent_pipeline_id, top_level_browsing_context_id), - Some(frame_element) => frame_element.dispatch_mozbrowser_event(event), - }, - } - } - fn handle_update_pipeline_id(&self, parent_pipeline_id: PipelineId, browsing_context_id: BrowsingContextId, @@ -2026,7 +1998,7 @@ impl ScriptThread { result_receiver.recv().expect("Failed to get frame id from constellation.") } - fn ask_constellation_for_parent_info(&self, pipeline_id: PipelineId) -> Option<(PipelineId, FrameType)> { + fn ask_constellation_for_parent_info(&self, pipeline_id: PipelineId) -> Option<PipelineId> { let (result_sender, result_receiver) = ipc::channel().unwrap(); let msg = ScriptMsg::GetParentInfo(pipeline_id, result_sender); self.script_sender.send((pipeline_id, msg)).expect("Failed to send to constellation."); @@ -2049,12 +2021,9 @@ impl ScriptThread { if let Some(window_proxy) = self.window_proxies.borrow().get(&browsing_context_id) { return Some(DomRoot::from_ref(window_proxy)); } - let parent = match self.ask_constellation_for_parent_info(pipeline_id) { - Some((parent_id, FrameType::IFrame)) => self.remote_window_proxy(global_to_clone, - top_level_browsing_context_id, - parent_id), - _ => None, - }; + let parent = self.ask_constellation_for_parent_info(pipeline_id).and_then(|parent_id| { + self.remote_window_proxy(global_to_clone, top_level_browsing_context_id, parent_id) + }); let window_proxy = WindowProxy::new_dissimilar_origin(global_to_clone, browsing_context_id, top_level_browsing_context_id, @@ -2073,22 +2042,21 @@ impl ScriptThread { window: &Window, browsing_context_id: BrowsingContextId, top_level_browsing_context_id: TopLevelBrowsingContextId, - parent_info: Option<(PipelineId, FrameType)>) + parent_info: Option<PipelineId>) -> DomRoot<WindowProxy> { if let Some(window_proxy) = self.window_proxies.borrow().get(&browsing_context_id) { window_proxy.set_currently_active(&*window); return DomRoot::from_ref(window_proxy); } - let iframe = match parent_info { - Some((parent_id, FrameType::IFrame)) => self.documents.borrow().find_iframe(parent_id, browsing_context_id), - _ => None, - }; + let iframe = parent_info.and_then(|parent_id| { + self.documents.borrow().find_iframe(parent_id, browsing_context_id) + }); let parent = match (parent_info, iframe.as_ref()) { (_, Some(iframe)) => Some(window_from_node(&**iframe).window_proxy()), - (Some((parent_id, FrameType::IFrame)), _) => self.remote_window_proxy(window.upcast(), - top_level_browsing_context_id, - parent_id), + (Some(parent_id), _) => self.remote_window_proxy(window.upcast(), + top_level_browsing_context_id, + parent_id), _ => None, }; let window_proxy = WindowProxy::new(&window, diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index fb6fff49536..14e0472da60 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -48,13 +48,12 @@ use hyper::method::Method; use ipc_channel::{Error as IpcError}; use ipc_channel::ipc::{IpcReceiver, IpcSender}; use libc::c_void; -use msg::constellation_msg::{BrowsingContextId, TopLevelBrowsingContextId, FrameType, Key, KeyModifiers, KeyState}; +use msg::constellation_msg::{BrowsingContextId, TopLevelBrowsingContextId, Key, KeyModifiers, KeyState}; use msg::constellation_msg::{PipelineId, PipelineNamespaceId, TraversalDirection}; use net_traits::{FetchResponseMsg, ReferrerPolicy, ResourceThreads}; use net_traits::image::base::Image; use net_traits::image::base::PixelFormat; use net_traits::image_cache::ImageCache; -use net_traits::response::HttpsState; use net_traits::storage_thread::StorageType; use profile_traits::mem; use profile_traits::time as profile_time; @@ -186,7 +185,7 @@ impl LoadData { pub struct NewLayoutInfo { /// The ID of the parent pipeline and frame type, if any. /// If `None`, this is a root pipeline. - pub parent_info: Option<(PipelineId, FrameType)>, + pub parent_info: Option<PipelineId>, /// Id of the newly-created pipeline. pub new_pipeline_id: PipelineId, /// Id of the browsing context associated with this pipeline. @@ -287,9 +286,6 @@ pub enum ConstellationControlMsg { Navigate(PipelineId, BrowsingContextId, LoadData, bool), /// Post a message to a given window. PostMessage(PipelineId, Option<ImmutableOrigin>, Vec<u8>), - /// Requests the script thread forward a mozbrowser event to a mozbrowser iframe it owns, - /// or to the window if no browsing context id is provided. - MozBrowserEvent(PipelineId, Option<TopLevelBrowsingContextId>, MozBrowserEvent), /// Updates the current pipeline ID of a given iframe. /// First PipelineId is for the parent, second is the new PipelineId for the frame. UpdatePipelineId(PipelineId, BrowsingContextId, PipelineId, UpdatePipelineIdReason), @@ -346,7 +342,6 @@ impl fmt::Debug for ConstellationControlMsg { NotifyVisibilityChange(..) => "NotifyVisibilityChange", Navigate(..) => "Navigate", PostMessage(..) => "PostMessage", - MozBrowserEvent(..) => "MozBrowserEvent", UpdatePipelineId(..) => "UpdatePipelineId", FocusIFrame(..) => "FocusIFrame", WebDriverScriptCommand(..) => "WebDriverScriptCommand", @@ -511,7 +506,7 @@ pub struct InitialScriptState { pub id: PipelineId, /// The subpage ID of this pipeline to create in its pipeline parent. /// If `None`, this is the root. - pub parent_info: Option<(PipelineId, FrameType)>, + pub parent_info: Option<PipelineId>, /// The ID of the browsing context this script is part of. pub browsing_context_id: BrowsingContextId, /// The ID of the top-level browsing context this script is part of. @@ -579,14 +574,11 @@ pub struct IFrameLoadInfo { /// The ID for this iframe's nested browsing context. pub browsing_context_id: BrowsingContextId, /// The ID for the top-level ancestor browsing context of this iframe's nested browsing context. - /// Note: this is the same as the browsing_context_id for mozbrowser iframes. pub top_level_browsing_context_id: TopLevelBrowsingContextId, /// The new pipeline ID that the iframe has generated. pub new_pipeline_id: PipelineId, /// Whether this iframe should be considered private pub is_private: bool, - /// Whether this iframe is a mozbrowser iframe - pub frame_type: FrameType, /// Wether this load should replace the current entry (reload). If true, the current /// entry will be replaced instead of a new entry being added. pub replace: bool, @@ -605,94 +597,6 @@ pub struct IFrameLoadInfoWithData { pub sandbox: IFrameSandboxState, } -// https://developer.mozilla.org/en-US/docs/Web/API/Using_the_Browser_API#Events -/// The events fired in a Browser API context (`<iframe mozbrowser>`) -#[derive(Deserialize, Serialize)] -pub enum MozBrowserEvent { - /// Sent when the scroll position within a browser `<iframe>` changes. - AsyncScroll, - /// Sent when window.close() is called within a browser `<iframe>`. - Close, - /// Sent when a browser `<iframe>` tries to open a context menu. This allows - /// handling `<menuitem>` element available within the browser `<iframe>`'s content. - ContextMenu, - /// Sent when an error occurred while trying to load content within a browser `<iframe>`. - /// Includes a human-readable description, and a machine-readable report. - Error(MozBrowserErrorType, String, String), - /// Sent when the favicon of a browser `<iframe>` changes. - IconChange(String, String, String), - /// Sent when the browser `<iframe>` has reached the server. - Connected, - /// Sent when the browser `<iframe>` has finished loading all its assets. - LoadEnd, - /// Sent when the browser `<iframe>` starts to load a new page. - LoadStart, - /// Sent when a browser `<iframe>`'s location changes. - LocationChange(String, bool, bool), - /// Sent when a new tab is opened within a browser `<iframe>` as a result of the user - /// issuing a command to open a link target in a new tab (for example ctrl/cmd + click.) - /// Includes the URL. - OpenTab(String), - /// Sent when a new window is opened within a browser `<iframe>`. - /// Includes the URL, target browsing context name, and features. - OpenWindow(String, Option<String>, Option<String>), - /// Sent when the SSL state changes within a browser `<iframe>`. - SecurityChange(HttpsState), - /// Sent when alert(), confirm(), or prompt() is called within a browser `<iframe>`. - ShowModalPrompt(String, String, String, String), // TODO(simartin): Handle unblock() - /// Sent when the document.title changes within a browser `<iframe>`. - TitleChange(String), - /// Sent when an HTTP authentification is requested. - UsernameAndPasswordRequired, - /// Sent when a link to a search engine is found. - OpenSearch, - /// Sent when visibility state changes. - VisibilityChange(bool), -} - -impl MozBrowserEvent { - /// Get the name of the event as a `& str` - pub fn name(&self) -> &'static str { - match *self { - MozBrowserEvent::AsyncScroll => "mozbrowserasyncscroll", - MozBrowserEvent::Close => "mozbrowserclose", - MozBrowserEvent::Connected => "mozbrowserconnected", - MozBrowserEvent::ContextMenu => "mozbrowsercontextmenu", - MozBrowserEvent::Error(_, _, _) => "mozbrowsererror", - MozBrowserEvent::IconChange(_, _, _) => "mozbrowsericonchange", - MozBrowserEvent::LoadEnd => "mozbrowserloadend", - MozBrowserEvent::LoadStart => "mozbrowserloadstart", - MozBrowserEvent::LocationChange(_, _, _) => "mozbrowserlocationchange", - MozBrowserEvent::OpenTab(_) => "mozbrowseropentab", - MozBrowserEvent::OpenWindow(_, _, _) => "mozbrowseropenwindow", - MozBrowserEvent::SecurityChange(_) => "mozbrowsersecuritychange", - MozBrowserEvent::ShowModalPrompt(_, _, _, _) => "mozbrowsershowmodalprompt", - MozBrowserEvent::TitleChange(_) => "mozbrowsertitlechange", - MozBrowserEvent::UsernameAndPasswordRequired => "mozbrowserusernameandpasswordrequired", - MozBrowserEvent::OpenSearch => "mozbrowseropensearch", - MozBrowserEvent::VisibilityChange(_) => "mozbrowservisibilitychange", - } - } -} - -// https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowsererror -/// The different types of Browser error events -#[derive(Deserialize, Serialize)] -pub enum MozBrowserErrorType { - // For the moment, we are just reporting panics, using the "fatal" type. - /// A fatal error - Fatal, -} - -impl MozBrowserErrorType { - /// Get the name of the error type as a `& str` - pub fn name(&self) -> &'static str { - match *self { - MozBrowserErrorType::Fatal => "fatal", - } - } -} - /// Specifies whether the script or layout thread needs to be ticked for animation. #[derive(Deserialize, Serialize)] pub enum AnimationTickType { diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs index 6ff47b5e004..524a87d039a 100644 --- a/components/script_traits/script_msg.rs +++ b/components/script_traits/script_msg.rs @@ -9,7 +9,6 @@ use IFrameLoadInfo; use IFrameLoadInfoWithData; use LayoutControlMsg; use LoadData; -use MozBrowserEvent; use WorkerGlobalScopeInit; use WorkerScriptLoadOrigin; use canvas_traits::canvas::CanvasMsg; @@ -17,7 +16,7 @@ use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId}; use euclid::{Point2D, Size2D, TypedSize2D}; use gfx_traits::Epoch; use ipc_channel::ipc::{IpcReceiver, IpcSender}; -use msg::constellation_msg::{BrowsingContextId, FrameType, PipelineId, TraversalDirection}; +use msg::constellation_msg::{BrowsingContextId, PipelineId, TraversalDirection}; use msg::constellation_msg::{Key, KeyModifiers, KeyState}; use net_traits::CoreResourceMsg; use net_traits::request::RequestInit; @@ -89,7 +88,7 @@ pub enum ScriptMsg { /// Get the browsing context id for a given pipeline. GetBrowsingContextId(PipelineId, IpcSender<Option<BrowsingContextId>>), /// Get the parent info for a given pipeline. - GetParentInfo(PipelineId, IpcSender<Option<(PipelineId, FrameType)>>), + GetParentInfo(PipelineId, IpcSender<Option<PipelineId>>), /// <head> tag finished parsing HeadParsed, /// All pending loads are complete, and the `load` event for this pipeline @@ -102,8 +101,6 @@ pub enum ScriptMsg { AbortLoadUrl, /// Post a message to the currently active window of a given browsing context. PostMessage(BrowsingContextId, Option<ImmutableOrigin>, Vec<u8>), - /// Dispatch a mozbrowser event to the parent of a mozbrowser iframe. - MozBrowserEvent(PipelineId, MozBrowserEvent), /// HTMLIFrameElement Forward or Back traversal. TraverseHistory(TraversalDirection), /// Gets the length of the joint session history from the constellation. |