aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmlscriptelement.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-01-16 11:11:46 -0800
committerGitHub <noreply@github.com>2017-01-16 11:11:46 -0800
commitecd1d2dbc9a94c88c718cb311603d35a4f667356 (patch)
tree19a9b7578991c6b67ccaae81475807f3ab050a99 /components/script/dom/htmlscriptelement.rs
parente891277dd5a52bc3a2b76dfd78da9b82b4c11b40 (diff)
parent6f19b0cd8209252541109108b09a47badfc9995e (diff)
downloadservo-ecd1d2dbc9a94c88c718cb311603d35a4f667356.tar.gz
servo-ecd1d2dbc9a94c88c718cb311603d35a4f667356.zip
Auto merge of #15020 - jdm:external_script_line, r=Ms2ger
Do not use the script element's line number for external scripts. This was yielding incorrect line numbers when looking at JS backtraces in gdb. - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] There are tests for these changes <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15020) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmlscriptelement.rs')
-rw-r--r--components/script/dom/htmlscriptelement.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index d80ab78c9f7..e1b23f9b2b2 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -500,9 +500,10 @@ impl HTMLScriptElement {
// Step 5.a.2.
let window = window_from_node(self);
+ let line_number = if script.external { 1 } else { self.line_number as u32 };
rooted!(in(window.get_cx()) let mut rval = UndefinedValue());
window.upcast::<GlobalScope>().evaluate_script_on_global_with_result(
- &script.text, script.url.as_str(), rval.handle_mut(), self.line_number as u32);
+ &script.text, script.url.as_str(), rval.handle_mut(), line_number);
// Step 6.
document.set_current_script(old_script.r());