aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/characterdata.rs42
-rw-r--r--components/script/dom/comment.rs5
-rw-r--r--components/script/dom/document.rs5
-rw-r--r--components/script/dom/htmltitleelement.rs5
-rw-r--r--components/script/dom/node.rs25
-rw-r--r--components/script/dom/processinginstruction.rs4
-rw-r--r--components/script/dom/text.rs5
-rw-r--r--components/script/parse/html.rs22
8 files changed, 52 insertions, 61 deletions
diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs
index 1796663acf0..82fcc459fec 100644
--- a/components/script/dom/characterdata.rs
+++ b/components/script/dom/characterdata.rs
@@ -10,7 +10,7 @@ use dom::bindings::codegen::InheritTypes::{CharacterDataDerived, ElementCast};
use dom::bindings::codegen::InheritTypes::NodeCast;
use dom::bindings::error::{Fallible, ErrorResult};
use dom::bindings::error::Error::IndexSize;
-use dom::bindings::js::{JSRef, Temporary};
+use dom::bindings::js::{JSRef, LayoutJS, Temporary};
use dom::document::Document;
use dom::element::Element;
use dom::eventtarget::{EventTarget, EventTargetTypeId};
@@ -45,23 +45,6 @@ impl CharacterData {
data: DOMRefCell::new(data),
}
}
-
- #[inline]
- pub fn node<'a>(&'a self) -> &'a Node {
- &self.node
- }
-
- #[inline]
- pub fn data(&self) -> Ref<DOMString> {
- self.data.borrow()
- }
-
- #[inline]
- #[allow(unsafe_code)]
- pub unsafe fn data_for_layout<'a>(&'a self) -> &'a str {
- self.data.borrow_for_layout().as_slice()
- }
-
}
impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> {
@@ -144,3 +127,26 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> {
}
}
+pub trait CharacterDataHelpers<'a> {
+ fn data(self) -> Ref<'a, DOMString>;
+}
+
+impl<'a> CharacterDataHelpers<'a> for JSRef<'a, CharacterData> {
+ #[inline]
+ fn data(self) -> Ref<'a, DOMString> {
+ self.extended_deref().data.borrow()
+ }
+}
+
+#[allow(unsafe_code)]
+pub trait LayoutCharacterDataHelpers {
+ unsafe fn data_for_layout<'a>(&'a self) -> &'a str;
+}
+
+#[allow(unsafe_code)]
+impl LayoutCharacterDataHelpers for LayoutJS<CharacterData> {
+ #[inline]
+ unsafe fn data_for_layout<'a>(&'a self) -> &'a str {
+ &(*self.unsafe_get()).data.borrow_for_layout()
+ }
+}
diff --git a/components/script/dom/comment.rs b/components/script/dom/comment.rs
index 85cca18b2b2..743e935db01 100644
--- a/components/script/dom/comment.rs
+++ b/components/script/dom/comment.rs
@@ -42,10 +42,5 @@ impl Comment {
let document = global.as_window().Document().root();
Ok(Comment::new(data, document.r()))
}
-
- #[inline]
- pub fn characterdata<'a>(&'a self) -> &'a CharacterData {
- &self.characterdata
- }
}
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 9812cf13f0b..ca4182164d8 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -18,7 +18,7 @@ use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLAnchorElementCas
use dom::bindings::codegen::InheritTypes::{HTMLAnchorElementDerived, HTMLAppletElementDerived};
use dom::bindings::codegen::InheritTypes::{HTMLAreaElementDerived, HTMLEmbedElementDerived};
use dom::bindings::codegen::InheritTypes::{HTMLFormElementDerived, HTMLImageElementDerived};
-use dom::bindings::codegen::InheritTypes::{HTMLScriptElementDerived};
+use dom::bindings::codegen::InheritTypes::{HTMLScriptElementDerived, CharacterDataCast};
use dom::bindings::error::{ErrorResult, Fallible};
use dom::bindings::error::Error::{NotSupported, InvalidCharacter, Security};
use dom::bindings::error::Error::HierarchyRequest;
@@ -29,6 +29,7 @@ use dom::bindings::refcounted::Trusted;
use dom::bindings::utils::reflect_dom_object;
use dom::bindings::utils::{xml_name_type, validate_and_extract};
use dom::bindings::utils::XMLName::InvalidXMLName;
+use dom::characterdata::CharacterDataHelpers;
use dom::comment::Comment;
use dom::customevent::CustomEvent;
use dom::documentfragment::DocumentFragment;
@@ -1125,7 +1126,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
for child in title_element.children() {
let child = child.root();
if let Some(text) = TextCast::to_ref(child.r()) {
- title.push_str(&text.characterdata().data());
+ title.push_str(&CharacterDataCast::from_ref(text).data());
}
}
}
diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/htmltitleelement.rs
index df2592acef9..5fb9cd3b25f 100644
--- a/components/script/dom/htmltitleelement.rs
+++ b/components/script/dom/htmltitleelement.rs
@@ -6,8 +6,9 @@ use dom::bindings::codegen::Bindings::HTMLTitleElementBinding;
use dom::bindings::codegen::Bindings::HTMLTitleElementBinding::HTMLTitleElementMethods;
use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLTitleElementDerived, NodeCast};
-use dom::bindings::codegen::InheritTypes::{TextCast};
+use dom::bindings::codegen::InheritTypes::{CharacterDataCast, TextCast};
use dom::bindings::js::{JSRef, Temporary};
+use dom::characterdata::CharacterDataHelpers;
use dom::document::{Document, DocumentHelpers};
use dom::eventtarget::{EventTarget, EventTargetTypeId};
use dom::element::ElementTypeId;
@@ -51,7 +52,7 @@ impl<'a> HTMLTitleElementMethods for JSRef<'a, HTMLTitleElement> {
let child = child.root();
let text: Option<JSRef<Text>> = TextCast::to_ref(child.r());
match text {
- Some(text) => content.push_str(text.characterdata().data().as_slice()),
+ Some(text) => content.push_str(&CharacterDataCast::from_ref(text).data()),
None => (),
}
}
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index f6c7adc2668..89ec44718eb 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -13,12 +13,11 @@ use dom::bindings::codegen::Bindings::NamedNodeMapBinding::NamedNodeMapMethods;
use dom::bindings::codegen::Bindings::NodeBinding::{NodeConstants, NodeMethods};
use dom::bindings::codegen::Bindings::NodeListBinding::NodeListMethods;
use dom::bindings::codegen::Bindings::ProcessingInstructionBinding::ProcessingInstructionMethods;
-use dom::bindings::codegen::InheritTypes::{CommentCast, DocumentCast, DocumentTypeCast};
-use dom::bindings::codegen::InheritTypes::{ElementCast, TextCast, NodeCast, ElementDerived};
-use dom::bindings::codegen::InheritTypes::{CharacterDataCast, NodeBase, NodeDerived};
-use dom::bindings::codegen::InheritTypes::{ProcessingInstructionCast, EventTargetCast};
+use dom::bindings::codegen::InheritTypes::{CharacterDataCast, DocumentCast, DocumentTypeCast};
+use dom::bindings::codegen::InheritTypes::{ElementCast, NodeCast, ElementDerived, EventTargetCast};
use dom::bindings::codegen::InheritTypes::{HTMLLegendElementDerived, HTMLFieldSetElementDerived};
-use dom::bindings::codegen::InheritTypes::HTMLOptGroupElementDerived;
+use dom::bindings::codegen::InheritTypes::{HTMLOptGroupElementDerived, NodeBase, NodeDerived};
+use dom::bindings::codegen::InheritTypes::{ProcessingInstructionCast, TextCast};
use dom::bindings::conversions;
use dom::bindings::error::Fallible;
use dom::bindings::error::Error::{NotFound, HierarchyRequest, Syntax};
@@ -29,7 +28,7 @@ use dom::bindings::js::{ResultRootable, OptionalRootable, MutNullableJS};
use dom::bindings::trace::JSTraceable;
use dom::bindings::trace::RootedVec;
use dom::bindings::utils::{Reflectable, reflect_dom_object};
-use dom::characterdata::CharacterData;
+use dom::characterdata::{CharacterData, CharacterDataHelpers};
use dom::comment::Comment;
use dom::document::{Document, DocumentHelpers, IsHTMLDocument, DocumentSource};
use dom::documentfragment::DocumentFragment;
@@ -1601,8 +1600,8 @@ impl Node {
NodeCast::from_temporary(doc_fragment)
},
NodeTypeId::Comment => {
- let comment: JSRef<Comment> = CommentCast::to_ref(node).unwrap();
- let comment = Comment::new(comment.characterdata().data().clone(), document.r());
+ let cdata = CharacterDataCast::to_ref(node).unwrap();
+ let comment = Comment::new(cdata.Data(), document.r());
NodeCast::from_temporary(comment)
},
NodeTypeId::Document => {
@@ -1629,14 +1628,14 @@ impl Node {
NodeCast::from_temporary(element)
},
NodeTypeId::Text => {
- let text: JSRef<Text> = TextCast::to_ref(node).unwrap();
- let text = Text::new(text.characterdata().data().clone(), document.r());
+ let cdata = CharacterDataCast::to_ref(node).unwrap();
+ let text = Text::new(cdata.Data(), document.r());
NodeCast::from_temporary(text)
},
NodeTypeId::ProcessingInstruction => {
let pi: JSRef<ProcessingInstruction> = ProcessingInstructionCast::to_ref(node).unwrap();
let pi = ProcessingInstruction::new(pi.target().clone(),
- pi.characterdata().data().clone(), document.r());
+ CharacterDataCast::from_ref(pi).Data(), document.r());
NodeCast::from_temporary(pi)
},
}.root();
@@ -1696,7 +1695,7 @@ impl Node {
let node = node.root();
let text = TextCast::to_ref(node.r());
match text {
- Some(text) => content.push_str(text.characterdata().data().as_slice()),
+ Some(text) => content.push_str(&CharacterDataCast::from_ref(text).Data()),
None => (),
}
}
@@ -2123,7 +2122,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
let pi: JSRef<ProcessingInstruction> = ProcessingInstructionCast::to_ref(node).unwrap();
let other_pi: JSRef<ProcessingInstruction> = ProcessingInstructionCast::to_ref(other).unwrap();
(*pi.target() == *other_pi.target()) &&
- (*pi.characterdata().data() == *other_pi.characterdata().data())
+ (*CharacterDataCast::from_ref(pi).data() == *CharacterDataCast::from_ref(other_pi).data())
}
fn is_equal_characterdata(node: JSRef<Node>, other: JSRef<Node>) -> bool {
let characterdata: JSRef<CharacterData> = CharacterDataCast::to_ref(node).unwrap();
diff --git a/components/script/dom/processinginstruction.rs b/components/script/dom/processinginstruction.rs
index 528c4cdd64a..c9d102b9862 100644
--- a/components/script/dom/processinginstruction.rs
+++ b/components/script/dom/processinginstruction.rs
@@ -38,10 +38,6 @@ impl ProcessingInstruction {
document, ProcessingInstructionBinding::Wrap)
}
- pub fn characterdata<'a>(&'a self) -> &'a CharacterData {
- &self.characterdata
- }
-
pub fn target<'a>(&'a self) -> &'a DOMString {
&self.target
}
diff --git a/components/script/dom/text.rs b/components/script/dom/text.rs
index ea6c2791e96..c2e9c588665 100644
--- a/components/script/dom/text.rs
+++ b/components/script/dom/text.rs
@@ -42,10 +42,5 @@ impl Text {
let document = global.as_window().Document().root();
Ok(Text::new(text, document.r()))
}
-
- #[inline]
- pub fn characterdata<'a>(&'a self) -> &'a CharacterData {
- &self.characterdata
- }
}
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs
index 66a95f2e879..d3e6b981783 100644
--- a/components/script/parse/html.rs
+++ b/components/script/parse/html.rs
@@ -7,13 +7,14 @@
use dom::attr::AttrHelpers;
use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
-use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast, HTMLScriptElementCast};
-use dom::bindings::codegen::InheritTypes::{DocumentTypeCast, TextCast, CommentCast};
+use dom::bindings::codegen::InheritTypes::{CharacterDataCast, DocumentTypeCast};
+use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLScriptElementCast};
+use dom::bindings::codegen::InheritTypes::{HTMLFormElementDerived, NodeCast};
use dom::bindings::codegen::InheritTypes::ProcessingInstructionCast;
-use dom::bindings::codegen::InheritTypes::HTMLFormElementDerived;
use dom::bindings::js::{JS, JSRef, Temporary, OptionalRootable, Root};
use dom::bindings::js::RootedReference;
use dom::bindings::trace::RootedVec;
+use dom::characterdata::CharacterDataHelpers;
use dom::comment::Comment;
use dom::document::{Document, DocumentHelpers};
use dom::document::{DocumentSource, IsHTMLDocument};
@@ -234,22 +235,19 @@ impl<'a> Serializable for JSRef<'a, Node> {
},
(IncludeNode, NodeTypeId::Text) => {
- let text: JSRef<Text> = TextCast::to_ref(node).unwrap();
- let data = text.characterdata().data();
- serializer.write_text(data.as_slice())
+ let cdata = CharacterDataCast::to_ref(node).unwrap();
+ serializer.write_text(&cdata.data())
},
(IncludeNode, NodeTypeId::Comment) => {
- let comment: JSRef<Comment> = CommentCast::to_ref(node).unwrap();
- let data = comment.characterdata().data();
- serializer.write_comment(data.as_slice())
+ let cdata = CharacterDataCast::to_ref(node).unwrap();
+ serializer.write_comment(&cdata.data())
},
(IncludeNode, NodeTypeId::ProcessingInstruction) => {
let pi: JSRef<ProcessingInstruction> = ProcessingInstructionCast::to_ref(node).unwrap();
- let data = pi.characterdata().data();
- serializer.write_processing_instruction(pi.target().as_slice(),
- data.as_slice())
+ let data = CharacterDataCast::from_ref(pi).data();
+ serializer.write_processing_instruction(&pi.target(), &data)
},
(IncludeNode, NodeTypeId::DocumentFragment) => Ok(()),
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-25 22:17:50 +0000