Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-09 07:25:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

allow_navigation: use channel to send response

Browse source
This commit is contained in:
Paul Rouget 2017-06-26 08:13:10 +02:00
parent d8ba8cad58
commit cd3172c913
7 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/compositing/compositor.rs
View file

@ -509,10 +509,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
}
(Msg::AllowNavigation(url, response_chan), ShutdownState::NotShuttingDown) => {
let allow = self.window.allow_navigation(url);
if let Err(e) = response_chan.send(allow) {
warn!("Failed to send allow_navigation result ({}).", e);
}
self.window.allow_navigation(url, response_chan);
}
(Msg::Recomposite(reason), ShutdownState::NotShuttingDown) => {

3
components/compositing/windowing.rs
View file

@ -8,6 +8,7 @@ use compositor_thread::EventLoopWaker;
use euclid::{Point2D, Size2D};
use euclid::{TypedPoint2D, TypedRect, ScaleFactor, TypedSize2D};
use gleam::gl;
use ipc_channel::ipc::IpcSender;
use msg::constellation_msg::{Key, KeyModifiers, KeyState, TraversalDirection};
use net_traits::net_error_list::NetError;
use script_traits::{DevicePixel, LoadData, MouseButton, TouchEventType, TouchId, TouchpadPressurePhase};
@ -131,7 +132,7 @@ pub trait WindowMethods {
/// Called when the browser encounters an error while loading a URL
fn load_error(&self, code: NetError, url: String);
/// Wether or not to follow a link
fn allow_navigation(&self, url: ServoUrl) -> bool;
fn allow_navigation(&self, url: ServoUrl, IpcSender<bool>);
/// Called when the <head> tag has finished parsing
fn head_parsed(&self);
/// Called when the history state has changed.