aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-11-21 10:20:18 -0600
committerGitHub <noreply@github.com>2016-11-21 10:20:18 -0600
commitd562d101809fbbb3d43511ae4cd3acbee280a7e7 (patch)
tree250b2b5e118b2d9967d114f7dd6e6ecfba96cee0 /components/script/dom
parent6cc1976cca808cac2069b241885a9c102ee7424d (diff)
parent861bcb2b7937c965507f03e091def913f4591fd4 (diff)
downloadservo-d562d101809fbbb3d43511ae4cd3acbee280a7e7.tar.gz
servo-d562d101809fbbb3d43511ae4cd3acbee280a7e7.zip
Auto merge of #14210 - GuillaumeGomez:fragment_node, r=nox
Add missing action in CreateContextualFragment method r? @nox <!-- 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/14210) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/htmlscriptelement.rs4
-rw-r--r--components/script/dom/range.rs5
2 files changed, 7 insertions, 2 deletions
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 62e3cf68a86..6dd6349b185 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -595,6 +595,10 @@ impl HTMLScriptElement {
is_js
}
+ pub fn set_parser_inserted(&self, parser_inserted: bool) {
+ self.parser_inserted.set(parser_inserted);
+ }
+
pub fn set_already_started(&self, already_started: bool) {
self.already_started.set(already_started);
}
diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs
index c0709f17c7c..8e8b9888b87 100644
--- a/components/script/dom/range.rs
+++ b/components/script/dom/range.rs
@@ -903,9 +903,9 @@ impl RangeMethods for Range {
let node = self.StartContainer();
let element = match node.type_id() {
NodeTypeId::Document(_) | NodeTypeId::DocumentFragment => None,
- NodeTypeId::Element(_) => Some(node),
+ NodeTypeId::Element(_) => Some(Root::downcast::<Element>(node).unwrap()),
NodeTypeId::CharacterData(CharacterDataTypeId::Comment) |
- NodeTypeId::CharacterData(CharacterDataTypeId::Text) => node.GetParentNode(),
+ NodeTypeId::CharacterData(CharacterDataTypeId::Text) => node.GetParentElement(),
NodeTypeId::CharacterData(CharacterDataTypeId::ProcessingInstruction) |
NodeTypeId::DocumentType => unreachable!(),
};
@@ -928,6 +928,7 @@ impl RangeMethods for Range {
for node in fragment_node.upcast::<Node>().traverse_preorder() {
if let Some(script) = node.downcast::<HTMLScriptElement>() {
script.set_already_started(false);
+ script.set_parser_inserted(false);
}
}