From 9af07af8ba356d539844f4b85c13a297228f74ba Mon Sep 17 00:00:00 2001 From: Lanza Date: Sat, 16 Jan 2016 21:45:38 +0501 Subject: [PATCH] servo: Merge #9334 - DOMContentLoaded event should be trusted (from MonsieurLanza:DomContentLoadedBubbles); r=KiChjang Hopefully resolves #9332. Source-Repo: https://github.com/servo/servo Source-Revision: 5a954d2492195aab2f3bd5a8d2775ef5c586689d --- servo/components/script/dom/document.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/servo/components/script/dom/document.rs b/servo/components/script/dom/document.rs index aeceb32cf8bd..7d1171083738 100644 --- a/servo/components/script/dom/document.rs +++ b/servo/components/script/dom/document.rs @@ -13,7 +13,6 @@ use dom::bindings::codegen::Bindings::ElementBinding::ElementMethods; use dom::bindings::codegen::Bindings::EventBinding::EventMethods; use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::EventHandlerBinding::OnErrorEventHandlerNonNull; -use dom::bindings::codegen::Bindings::EventTargetBinding::EventTargetMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilter; use dom::bindings::codegen::Bindings::PerformanceBinding::PerformanceMethods; @@ -1350,12 +1349,12 @@ impl Document { update_with_current_time(&self.dom_content_loaded_event_start); - let event = Event::new(GlobalRef::Window(self.window()), - atom!("DOMContentLoaded"), - EventBubbles::Bubbles, - EventCancelable::NotCancelable); let doctarget = self.upcast::(); - let _ = doctarget.DispatchEvent(event.r()); + let _ = doctarget.fire_event("DOMContentLoaded", + EventBubbles::Bubbles, + EventCancelable::NotCancelable, + GlobalRef::Window(self.window())); + self.window().reflow(ReflowGoal::ForDisplay, ReflowQueryType::NoQuery, ReflowReason::DOMContentLoaded);