Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove the global argument to EventTarget::{fire_event, fire_simple_event}.

Browse source
This commit is contained in:
Ms2ger 2016-02-08 19:21:47 +01:00
parent 4c4df37a12
commit 5317af1e19
9 changed files with 30 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/script/dom/document.rs
View file

@ -550,8 +550,7 @@ impl Document {
self.ready_state.set(state);
self.upcast::<EventTarget>().fire_simple_event("readystatechange",
GlobalRef::Window(&self.window));
self.upcast::<EventTarget>().fire_simple_event("readystatechange");
}
/// Return whether scripting is enabled or not
@ -1357,8 +1356,7 @@ impl Document {
let doctarget = self.upcast::<EventTarget>();
let _ = doctarget.fire_event("DOMContentLoaded",
EventBubbles::Bubbles,
EventCancelable::NotCancelable,
GlobalRef::Window(self.window()));
EventCancelable::NotCancelable);
self.window().reflow(ReflowGoal::ForDisplay,
ReflowQueryType::NoQuery,
@ -1693,14 +1691,17 @@ impl DocumentMethods for Document {
// https://html.spec.whatwg.org/multipage/#dom-document-hasfocus
fn HasFocus(&self) -> bool {
let target = self; // Step 1.
// Step 1.
let target = self;
let browsing_context = self.window.browsing_context();
let browsing_context = browsing_context.as_ref();
match browsing_context {
Some(browsing_context) => {
let condidate = browsing_context.active_document(); // Step 2.
if condidate.node.get_unique_id() == target.node.get_unique_id() { // Step 3.
// Step 2.
let candidate = browsing_context.active_document();
// Step 3.
if candidate == target {
true
} else {
false //TODO Step 4.