diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-03-03 16:03:45 -0700 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-03-03 16:03:45 -0700 |
commit | 72f8898990f06e7f505eeaf9cfa671740c60395d (patch) | |
tree | 3cbe32bd57533c51472a31bf0c2e4c5a807870aa /components/script/dom/console.rs | |
parent | e19fbc686cd10d59c9e02593f0b6ab68aabe02fc (diff) | |
parent | b89339d05584e3bc27ba3a2cc58078e6e58a08d3 (diff) | |
download | servo-72f8898990f06e7f505eeaf9cfa671740c60395d.tar.gz servo-72f8898990f06e7f505eeaf9cfa671740c60395d.zip |
auto merge of #5118 : jdm/servo/pageload, r=Ms2ger
Rebased and improved version of #4967.
Diffstat (limited to 'components/script/dom/console.rs')
-rw-r--r-- | components/script/dom/console.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs index 4dec1c3bd45..6308556ef2e 100644 --- a/components/script/dom/console.rs +++ b/components/script/dom/console.rs @@ -7,6 +7,7 @@ use dom::bindings::codegen::Bindings::ConsoleBinding::ConsoleMethods; use dom::bindings::global::{GlobalRef, GlobalField}; use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::utils::{Reflector, reflect_dom_object}; +use dom::window::WindowHelpers; use devtools_traits::{DevtoolsControlMsg, ConsoleMessage}; use util::str::DOMString; @@ -66,8 +67,8 @@ fn propagate_console_msg(console: &JSRef<Console>, console_message: ConsoleMessa let global = console.global.root(); match global.r() { GlobalRef::Window(window_ref) => { - let pipelineId = window_ref.page().id; - console.global.root().r().as_window().page().devtools_chan.as_ref().map(|chan| { + let pipelineId = window_ref.pipeline(); + console.global.root().r().as_window().devtools_chan().as_ref().map(|chan| { chan.send(DevtoolsControlMsg::SendConsoleMessage( pipelineId, console_message.clone())).unwrap(); }); |