aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/element.rs
diff options
context:
space:
mode:
authorbors-servo <servo-ops@mozilla.com>2020-05-04 12:43:49 -0400
committerGitHub <noreply@github.com>2020-05-04 12:43:49 -0400
commit271ff16028a8aa3ab5fa6acf0590ddfbb0624eb8 (patch)
tree2c1b9fadfa7057f27bc6d1ba0ce7b883a66f4f2e /components/script/dom/element.rs
parentd33a784c665ec7233b8825bb87d9edc97df33d0b (diff)
parent1b2464b4b686019211248ea7f4b51aa360b808b2 (diff)
downloadservo-271ff16028a8aa3ab5fa6acf0590ddfbb0624eb8.tar.gz
servo-271ff16028a8aa3ab5fa6acf0590ddfbb0624eb8.zip
Auto merge of #26398 - Eijebong:fast-path-set-inner-html, r=jdm
Add a fast path in Element::SetInnerHTML when the value is small and trivial text Inspired from gecko which has a similar fast path. This makes innerHTML more than 10 times faster for this case. Fixes #25892
Diffstat (limited to 'components/script/dom/element.rs')
-rw-r--r--components/script/dom/element.rs19
1 files changed, 17 insertions, 2 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index baccc4e65aa..6f6f33f56a8 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -2449,8 +2449,6 @@ impl ElementMethods for Element {
/// <https://w3c.github.io/DOM-Parsing/#widl-Element-innerHTML>
fn SetInnerHTML(&self, value: DOMString) -> ErrorResult {
- // Step 1.
- let frag = self.parse_fragment(value)?;
// Step 2.
// https://github.com/w3c/DOM-Parsing/issues/1
let target = if let Some(template) = self.downcast::<HTMLTemplateElement>() {
@@ -2458,6 +2456,23 @@ impl ElementMethods for Element {
} else {
DomRoot::from_ref(self.upcast())
};
+
+ // Fast path for when the value is small, doesn't contain any markup and doesn't require
+ // extra work to set innerHTML.
+ if !self.node.has_weird_parser_insertion_mode() &&
+ value.len() < 100 &&
+ !value
+ .as_bytes()
+ .iter()
+ .any(|c| matches!(*c, b'&' | b'\0' | b'<' | b'\r'))
+ {
+ Node::SetTextContent(&target, Some(value));
+ return Ok(());
+ }
+
+ // Step 1.
+ let frag = self.parse_fragment(value)?;
+
Node::replace_all(Some(frag.upcast()), &target);
Ok(())
}