forked from mirrors/gecko-dev
> Here it is. > > ~~There's two major things that are unfinished here:~~ > - ~~Dealing with the unroot_must_root lint. I'm not sure about the value of this lint with the new rooting API.~~ Done. > - ~~Updating the Cargo.locks to point to the new SM and SM binding.~~ Done. > > I also included my fixes for the rust update, but these will disappear in a rebase. A rust update is necessary to support calling `Drop` on `Heap<T>` correctly when `Heap<T>` is inside a `Rc<T>`. Otherwise `&self` points to the wrong location. > > Incremental GC is disabled here. I'm not sure how to deal with the incremental barriers so that's left for later. > > Generational GC works. SM doesn't work without it. > > The biggest change here is to the rooting API. `Root` was made movable, and `Temporary` and `JSRef` was removed. Movable `Root`s means there's no need for `Temporary`, and `JSRef`s aren't needed generally since it can be assumed that being able to obtain a reference to a dom object means it's already rooted. References have their lifetime bound to the Roots that provided them. DOM objects that haven't passed through `reflect_dom_object` don't need to be rooted, and DOM objects that have passed through `reflect_dom_object` can't be obtained without being rooted through `native_from_reflector_jsmanaged` or `JS::<T>::root()`. > > Support for `Heap<T>` ended up messier than I expected. It's split into two commits, but only because it's a bit difficult to fold them together. Supporting `Heap<T>` properly requires that that `Heap::<T>::set()` be called on something that won't move. I removed the Copy and Clone trait from `Heap<T>` so `Cell` can't hold `Heap<T>` - only `UnsafeCell` can hold it. > > `CallbackObject` is a bit tricky - I moved all callbacks into `Rc<T>` in order to make sure that the pointer inside to a `*mut JSObject` doesn't move. This is necessary for supporting `Heap<T>`. > > `RootedCollectionSet` is very general purpose now. Anything with `JSTraceable` can be rooted by `RootedCollectionSet`/`RootedTraceable`. Right now, `RootedTraceable` is only used to hold down dom objects before they're fully attached to their reflector. I had to make a custom mechanism to dispatch the trace call - couldn't figure out how to get trait objects working for this case. > > This has been tested with the following zeal settings: > > GC after every allocation > JS_GC_ZEAL=2,1 > > GC after every 100 allocations (important for catching use-after-free bugs) > JS_GC_ZEAL=2,100 > > Verify pre barriers > JS_GC_ZEAL=4,1 > > Verify post barriers > JS_GC_ZEAL=11,1 Source-Repo: https://github.com/servo/servo Source-Revision: e7808c526c348fea5e3b48af70b7f1a066652097
104 lines
3.8 KiB
Rust
104 lines
3.8 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use dom::bindings::codegen::Bindings::TextBinding::{self, TextMethods};
|
|
use dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods;
|
|
use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
|
|
use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
|
|
use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
|
|
use dom::bindings::codegen::InheritTypes::{CharacterDataCast, TextDerived};
|
|
use dom::bindings::codegen::InheritTypes::NodeCast;
|
|
use dom::bindings::error::{Error, Fallible};
|
|
use dom::bindings::global::GlobalRef;
|
|
use dom::bindings::js::{RootedReference};
|
|
use dom::bindings::js::Root;
|
|
use dom::characterdata::{CharacterData, CharacterDataHelpers, CharacterDataTypeId};
|
|
use dom::document::Document;
|
|
use dom::eventtarget::{EventTarget, EventTargetTypeId};
|
|
use dom::node::{Node, NodeHelpers, NodeTypeId};
|
|
use util::str::DOMString;
|
|
|
|
/// An HTML text node.
|
|
#[dom_struct]
|
|
pub struct Text {
|
|
characterdata: CharacterData,
|
|
}
|
|
|
|
impl TextDerived for EventTarget {
|
|
fn is_text(&self) -> bool {
|
|
*self.type_id() == EventTargetTypeId::Node(NodeTypeId::CharacterData(CharacterDataTypeId::Text))
|
|
}
|
|
}
|
|
|
|
impl Text {
|
|
fn new_inherited(text: DOMString, document: &Document) -> Text {
|
|
Text {
|
|
characterdata: CharacterData::new_inherited(CharacterDataTypeId::Text, text, document)
|
|
}
|
|
}
|
|
|
|
pub fn new(text: DOMString, document: &Document) -> Root<Text> {
|
|
Node::reflect_node(box Text::new_inherited(text, document),
|
|
document, TextBinding::Wrap)
|
|
}
|
|
|
|
pub fn Constructor(global: GlobalRef, text: DOMString) -> Fallible<Root<Text>> {
|
|
let document = global.as_window().Document();
|
|
Ok(Text::new(text, document.r()))
|
|
}
|
|
}
|
|
|
|
impl<'a> TextMethods for &'a Text {
|
|
// https://dom.spec.whatwg.org/#dom-text-splittextoffset
|
|
fn SplitText(self, offset: u32) -> Fallible<Root<Text>> {
|
|
let cdata = CharacterDataCast::from_ref(self);
|
|
// Step 1.
|
|
let length = cdata.Length();
|
|
if offset > length {
|
|
// Step 2.
|
|
return Err(Error::IndexSize);
|
|
}
|
|
// Step 3.
|
|
let count = length - offset;
|
|
// Step 4.
|
|
let new_data = cdata.SubstringData(offset, count).unwrap();
|
|
// Step 5.
|
|
let node = NodeCast::from_ref(self);
|
|
let owner_doc = node.owner_doc();
|
|
let new_node = owner_doc.r().CreateTextNode(new_data);
|
|
// Step 6.
|
|
let parent = node.GetParentNode();
|
|
if let Some(ref parent) = parent {
|
|
// Step 7.
|
|
parent.r().InsertBefore(NodeCast::from_ref(new_node.r()),
|
|
node.GetNextSibling().r())
|
|
.unwrap();
|
|
// TODO: Ranges.
|
|
}
|
|
// Step 8.
|
|
cdata.DeleteData(offset, count).unwrap();
|
|
if parent.is_none() {
|
|
// Step 9.
|
|
// TODO: Ranges
|
|
}
|
|
// Step 10.
|
|
Ok(new_node)
|
|
}
|
|
|
|
// https://dom.spec.whatwg.org/#dom-text-wholetext
|
|
fn WholeText(self) -> DOMString {
|
|
let first = NodeCast::from_ref(self).inclusively_preceding_siblings()
|
|
.take_while(|node| node.r().is_text())
|
|
.last().unwrap();
|
|
let nodes = first.r().inclusively_following_siblings()
|
|
.take_while(|node| node.r().is_text());
|
|
let mut text = DOMString::new();
|
|
for ref node in nodes {
|
|
let cdata = CharacterDataCast::to_ref(node.r()).unwrap();
|
|
text.push_str(&cdata.data());
|
|
}
|
|
text
|
|
}
|
|
}
|
|
|