mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
mozbrowsersercuritychange event
This commit is contained in:
parent
fb3fe3d784
commit
63519c3574
13 changed files with 135 additions and 4 deletions
|
@ -60,6 +60,7 @@ use msg::constellation_msg::{PipelineId, SubpageId, WindowSizeData};
|
|||
use net_traits::Metadata;
|
||||
use net_traits::image::base::{Image, ImageMetadata};
|
||||
use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheThread};
|
||||
use net_traits::response::HttpsState;
|
||||
use net_traits::storage_thread::StorageType;
|
||||
use profile_traits::mem::ProfilerChan as MemProfilerChan;
|
||||
use profile_traits::time::ProfilerChan as TimeProfilerChan;
|
||||
|
@ -299,6 +300,7 @@ no_jsmanaged_fields!(Mime);
|
|||
no_jsmanaged_fields!(AttrIdentifier);
|
||||
no_jsmanaged_fields!(AttrValue);
|
||||
no_jsmanaged_fields!(ElementSnapshot);
|
||||
no_jsmanaged_fields!(HttpsState);
|
||||
|
||||
impl JSTraceable for ConstellationChan<ScriptMsg> {
|
||||
#[inline]
|
||||
|
|
|
@ -84,6 +84,7 @@ use msg::constellation_msg::{ConstellationChan, Key, KeyModifiers, KeyState};
|
|||
use msg::constellation_msg::{PipelineId, SubpageId};
|
||||
use net_traits::ControlMsg::{GetCookiesForUrl, SetCookiesForUrl};
|
||||
use net_traits::CookieSource::NonHTTP;
|
||||
use net_traits::response::HttpsState;
|
||||
use net_traits::{AsyncResponseTarget, PendingAsyncLoad};
|
||||
use num::ToPrimitive;
|
||||
use script_thread::{MainThreadScriptMsg, Runnable};
|
||||
|
@ -204,6 +205,8 @@ pub struct Document {
|
|||
dom_complete: Cell<u64>,
|
||||
/// Vector to store CSS errors
|
||||
css_errors_store: DOMRefCell<Vec<CSSError>>,
|
||||
/// https://html.spec.whatwg.org/multipage/#concept-document-https-state
|
||||
https_state: Cell<HttpsState>,
|
||||
}
|
||||
|
||||
#[derive(JSTraceable, HeapSizeOf)]
|
||||
|
@ -289,6 +292,11 @@ impl Document {
|
|||
self.is_html_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 report_css_error(&self, css_error: CSSError) {
|
||||
self.css_errors_store.borrow_mut().push(css_error);
|
||||
}
|
||||
|
@ -1525,6 +1533,7 @@ impl Document {
|
|||
dom_content_loaded_event_end: Cell::new(Default::default()),
|
||||
dom_complete: Cell::new(Default::default()),
|
||||
css_errors_store: DOMRefCell::new(vec![]),
|
||||
https_state: Cell::new(HttpsState::None),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
use dom::attr::{Attr, AttrValue};
|
||||
use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementIconChangeEventDetail;
|
||||
use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserElementSecurityChangeDetail;
|
||||
use dom::bindings::codegen::Bindings::BrowserElementBinding::BrowserShowModalPromptEventDetail;
|
||||
use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding;
|
||||
use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods;
|
||||
|
@ -29,6 +30,7 @@ use js::jsval::{UndefinedValue, NullValue};
|
|||
use layout_interface::ReflowQueryType;
|
||||
use msg::constellation_msg::{ConstellationChan};
|
||||
use msg::constellation_msg::{NavigationDirection, PipelineId, SubpageId};
|
||||
use net_traits::response::HttpsState;
|
||||
use page::IterablePage;
|
||||
use script_traits::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
|
||||
use script_traits::{IFrameLoadInfo, MozBrowserEvent, ScriptMsg as ConstellationMsg};
|
||||
|
@ -275,10 +277,26 @@ impl MozBrowserEventDetailBuilder for HTMLIFrameElement {
|
|||
match event {
|
||||
MozBrowserEvent::AsyncScroll | MozBrowserEvent::Close | MozBrowserEvent::ContextMenu |
|
||||
MozBrowserEvent::Error | MozBrowserEvent::LoadEnd | MozBrowserEvent::LoadStart |
|
||||
MozBrowserEvent::OpenWindow | MozBrowserEvent::SecurityChange | MozBrowserEvent::OpenSearch |
|
||||
MozBrowserEvent::OpenWindow | MozBrowserEvent::OpenSearch |
|
||||
MozBrowserEvent::UsernameAndPasswordRequired => {
|
||||
rval.set(NullValue());
|
||||
}
|
||||
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::LocationChange(ref string) | MozBrowserEvent::TitleChange(ref string) => {
|
||||
string.to_jsval(cx, rval);
|
||||
}
|
||||
|
|
|
@ -24,6 +24,36 @@ callback BrowserElementNextPaintEventCallback = void ();
|
|||
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 BrowserElementIconChangeEventDetail {
|
||||
DOMString rel;
|
||||
DOMString href;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue