aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/document.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-10-30 06:37:44 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-10-30 06:37:44 +0530
commit00b60b93860d32e1c5aaf0f9b4a2ce5110880652 (patch)
tree7758f97aedfc0fad86b1ee58c8a3ba0e4c976931 /components/script/dom/document.rs
parentb6bcccb204f710665482fa8098084a30126a3bac (diff)
parent4a4f041948f38818d9616125c1639e1431327d09 (diff)
downloadservo-00b60b93860d32e1c5aaf0f9b4a2ce5110880652.tar.gz
servo-00b60b93860d32e1c5aaf0f9b4a2ce5110880652.zip
Auto merge of #8250 - wenderen:8246-remove-get-rooted, r=Ms2ger
remove get_rooted() and replace all references to it with references … …to get() for #8246 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8250) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/document.rs')
-rw-r--r--components/script/dom/document.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 9564f8ccca8..2ad0a12262f 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -310,7 +310,7 @@ impl Document {
/// Returns the first `base` element in the DOM that has an `href` attribute.
pub fn base_element(&self) -> Option<Root<HTMLBaseElement>> {
- self.base_element.get_rooted()
+ self.base_element.get()
}
/// Refresh the cached first base element in the DOM.
@@ -508,7 +508,7 @@ impl Document {
/// Return the element that currently has focus.
// https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#events-focusevent-doc-focus
pub fn get_focused_element(&self) -> Option<Root<Element>> {
- self.focused.get_rooted()
+ self.focused.get()
}
/// Initiate a new round of checking for elements requesting focus. The last element to call
@@ -529,13 +529,13 @@ impl Document {
pub fn commit_focus_transaction(&self, focus_type: FocusType) {
//TODO: dispatch blur, focus, focusout, and focusin events
- if let Some(ref elem) = self.focused.get_rooted() {
+ if let Some(ref elem) = self.focused.get() {
elem.set_focus_state(false);
}
self.focused.set(self.possibly_focused.get().r());
- if let Some(ref elem) = self.focused.get_rooted() {
+ if let Some(ref elem) = self.focused.get() {
elem.set_focus_state(true);
// Update the focus state for all elements in the focus chain.
@@ -1045,7 +1045,7 @@ impl Document {
// A finished resource load can potentially unblock parsing. In that case, resume the
// parser so its loop can find out.
- if let Some(parser) = self.current_parser.get_rooted() {
+ if let Some(parser) = self.current_parser.get() {
if parser.is_suspended() {
parser.resume();
}
@@ -1063,7 +1063,7 @@ impl Document {
/// execute it.
/// https://html.spec.whatwg.org/multipage/#ready-to-be-parser-executed
fn maybe_execute_parser_blocking_script(&self) -> ParserBlockedByScript {
- let script = match self.pending_parsing_blocking_script.get_rooted() {
+ let script = match self.pending_parsing_blocking_script.get() {
None => return ParserBlockedByScript::Unblocked,
Some(script) => script,
};
@@ -1156,7 +1156,7 @@ impl Document {
}
pub fn get_current_parser(&self) -> Option<Root<ServoHTMLParser>> {
- self.current_parser.get_rooted()
+ self.current_parser.get()
}
/// Find an iframe element in the document.
@@ -1735,7 +1735,7 @@ impl DocumentMethods for Document {
// https://html.spec.whatwg.org/multipage/#dom-document-currentscript
fn GetCurrentScript(&self) -> Option<Root<HTMLScriptElement>> {
- self.current_script.get_rooted()
+ self.current_script.get()
}
// https://html.spec.whatwg.org/multipage/#dom-document-body