Auto merge of #5802 - mmatyas:indentfix, r=jdm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5802)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-04-22 19:49:30 -05:00
commit 43d666f94b
5 changed files with 29 additions and 29 deletions

View file

@ -540,18 +540,18 @@ impl<'a> TreeWalkerHelpers for JSRef<'a, TreeWalker> {
impl<'a> Iterator for JSRef<'a, TreeWalker> {
type Item = JSRef<'a, Node>;
fn next(&mut self) -> Option<JSRef<'a, Node>> {
match self.next_node() {
Ok(node) => node.map(|n| n.root().get_unsound_ref_forever()),
Err(_) =>
// The Err path happens only when a JavaScript
// NodeFilter throws an exception. This iterator
// is meant for internal use from Rust code, which
// will probably be using a native Rust filter,
// which cannot produce an Err result.
unreachable!()
fn next(&mut self) -> Option<JSRef<'a, Node>> {
match self.next_node() {
Ok(node) => node.map(|n| n.root().get_unsound_ref_forever()),
Err(_) =>
// The Err path happens only when a JavaScript
// NodeFilter throws an exception. This iterator
// is meant for internal use from Rust code, which
// will probably be using a native Rust filter,
// which cannot produce an Err result.
unreachable!()
}
}
}
}
#[jstraceable]

View file

@ -799,11 +799,11 @@ impl<'a> WindowHelpers for JSRef<'a, Window> {
// If we didn't have a clip rect, the previous display doesn't need rebuilding
// because it was built for infinite clip (MAX_RECT).
had_clip_rect
}
}
fn set_devtools_wants_updates(self, value: bool) {
self.devtools_wants_updates.set(value);
}
fn set_devtools_wants_updates(self, value: bool) {
self.devtools_wants_updates.set(value);
}
// https://html.spec.whatwg.org/multipage/#accessing-other-browsing-contexts
fn IndexedGetter(self, _index: u32, _found: &mut bool) -> Option<Temporary<Window>> {

View file

@ -818,7 +818,7 @@ impl ScriptTask {
return;
}
panic!("Page rect message sent to nonexistent pipeline");
}
}
/// Handle a request to load a page in a new child frame of an existing page.
fn handle_new_layout(&self, new_layout_info: NewLayoutInfo) {