aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmlscriptelement.rs
diff options
context:
space:
mode:
authorbors-servo <servo-ops@mozilla.com>2020-07-17 09:30:36 -0400
committerGitHub <noreply@github.com>2020-07-17 09:30:36 -0400
commitf221b0000759efbd5c42a0f5c905a10169a2fb9e (patch)
treec022b63efaa78e332bd6085b458a273fdafaa3d7 /components/script/dom/htmlscriptelement.rs
parent68cee9f7c1571110eba8650fc279af0721603651 (diff)
parentcdfd4d9075f31a80377f26315cd122e7e85e932b (diff)
downloadservo-f221b0000759efbd5c42a0f5c905a10169a2fb9e.tar.gz
servo-f221b0000759efbd5c42a0f5c905a10169a2fb9e.zip
Auto merge of #27282 - camelid:rc-domstring, r=jdm
Use `Rc` instead of cloning the `DOMString` <!-- Please describe your changes on the following line: --> I changed the `text` field of `ScriptOrigin` from a `DOMString` to an `Rc<DOMString>`. Then I updated all the related code to work with an `Rc`. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #27254 (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because this doesn't introduce new code and should only need to be checked by the compiler <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/script/dom/htmlscriptelement.rs')
-rw-r--r--components/script/dom/htmlscriptelement.rs24
1 files changed, 14 insertions, 10 deletions
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index fb5bca5fb2c..922a9ad2939 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -49,6 +49,7 @@ use std::fs::{create_dir_all, read_to_string, File};
use std::io::{Read, Seek, Write};
use std::path::PathBuf;
use std::process::Command;
+use std::rc::Rc;
use std::sync::{Arc, Mutex};
use style::str::{StaticStringVec, HTML_SPACE_CHARACTERS};
use uuid::Uuid;
@@ -150,14 +151,15 @@ pub enum ScriptType {
#[derive(JSTraceable, MallocSizeOf)]
pub struct ScriptOrigin {
- text: DOMString,
+ #[ignore_malloc_size_of = "Rc is hard"]
+ text: Rc<DOMString>,
url: ServoUrl,
external: bool,
type_: ScriptType,
}
impl ScriptOrigin {
- pub fn internal(text: DOMString, url: ServoUrl, type_: ScriptType) -> ScriptOrigin {
+ pub fn internal(text: Rc<DOMString>, url: ServoUrl, type_: ScriptType) -> ScriptOrigin {
ScriptOrigin {
text: text,
url: url,
@@ -166,7 +168,7 @@ impl ScriptOrigin {
}
}
- pub fn external(text: DOMString, url: ServoUrl, type_: ScriptType) -> ScriptOrigin {
+ pub fn external(text: Rc<DOMString>, url: ServoUrl, type_: ScriptType) -> ScriptOrigin {
ScriptOrigin {
text: text,
url: url,
@@ -175,8 +177,8 @@ impl ScriptOrigin {
}
}
- pub fn text(&self) -> DOMString {
- self.text.clone()
+ pub fn text(&self) -> Rc<DOMString> {
+ Rc::clone(&self.text)
}
}
@@ -257,7 +259,7 @@ impl FetchResponseListener for ClassicContext {
// Step 7.
let (source_text, _, _) = encoding.decode(&self.data);
ScriptOrigin::external(
- DOMString::from(source_text),
+ Rc::new(DOMString::from(source_text)),
metadata.final_url,
ScriptType::Classic,
)
@@ -611,9 +613,11 @@ impl HTMLScriptElement {
// Step 25.
assert!(!text.is_empty());
+ let text_rc = Rc::new(text);
+
// Step 25-1. & 25-2.
let result = Ok(ScriptOrigin::internal(
- text.clone(),
+ Rc::clone(&text_rc),
base_url.clone(),
script_type.clone(),
));
@@ -647,7 +651,7 @@ impl HTMLScriptElement {
fetch_inline_module_script(
ModuleOwner::Window(Trusted::new(self)),
- text.clone(),
+ text_rc,
base_url.clone(),
self.id.clone(),
credentials_mode.unwrap(),
@@ -679,7 +683,7 @@ impl HTMLScriptElement {
let mut script_content = String::new();
output.seek(std::io::SeekFrom::Start(0)).unwrap();
output.read_to_string(&mut script_content).unwrap();
- script.text = DOMString::from(script_content);
+ script.text = Rc::new(DOMString::from(script_content));
},
_ => {
warn!("Failed to execute js-beautify. Will store unmodified script");
@@ -757,7 +761,7 @@ impl HTMLScriptElement {
match read_to_string(path.clone()) {
Ok(local_script) => {
debug!("Found script stored at: {:?}", path);
- script.text = DOMString::from(local_script);
+ script.text = Rc::new(DOMString::from(local_script));
},
Err(why) => warn!("Could not restore script from file {:?}", why),
}