Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #2555 : brson/servo/warnings, r=metajack

Browse source 
Depends on https://github.com/mozilla-servo/rust-fontconfig/pull/19, https://github.com/mozilla-servo/rust-harfbuzz/pull/21, https://github.com/mozilla-servo/rust-hubbub/pull/23, https://github.com/mozilla-servo/rust-layers/pull/68, https://github.com/mozilla-servo/sharegl/pull/29, https://github.com/mozilla-servo/rust-mozjs/pull/85.
This commit is contained in:
bors-servo 2014-06-02 20:46:25 -04:00
commit 246c9759be
8 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/main/layout/block.rs
View file

@ -2012,7 +2012,7 @@ impl WidthAndMarginsComputer for AbsoluteNonReplaced {
right,
available_width,
static_x_offset,
direction,
..
} = input;
// TODO: Check for direction of parent flow (NOT Containing Block)
@ -2161,7 +2161,7 @@ impl WidthAndMarginsComputer for AbsoluteReplaced {
right,
available_width,
static_x_offset,
direction,
..
} = input;
// TODO: Check for direction of static-position Containing Block (aka
// parent flow, _not_ the actual Containing Block) when right-to-left

2
src/components/script/dom/node.rs
View file

@ -1276,7 +1276,7 @@ impl Node {
// Step 6.
if clone_children == CloneChildren {
for ref child in node.children() {
let mut child_copy = Node::clone(&*child, Some(&*document), clone_children).root();
let child_copy = Node::clone(&*child, Some(&*document), clone_children).root();
let _inserted_node = Node::pre_insert(&*child_copy, &*copy, None);
}
}

2
src/platform/linux/rust-fontconfig

@ -1 +1 @@
Subproject commit ee502da58190ecdd85d08eb0e11a2393cb0bd9dd
Subproject commit 51ea197c6f13ef4bb82910f0c955d5f8b064f007

2
src/support/harfbuzz/rust-harfbuzz

@ -1 +1 @@
Subproject commit 838abe15d587fc2ac988356f98bb34e6c3c6ae7c
Subproject commit b0791864a1f37d52b85f7438e7571b02907f2a56

2
src/support/hubbub/rust-hubbub

@ -1 +1 @@
Subproject commit f85aedc76488b75bc05c6497d61ed791f1bc9668
Subproject commit 62afc3d7da5a0f95d4e5c32096d2b701cfcd97ab

2
src/support/layers/rust-layers

@ -1 +1 @@
Subproject commit b3ba5e7babd5d33c7962473a734296224f04df3e
Subproject commit 29a0f4c36292314671778631e336aa845276c733

2
src/support/sharegl/sharegl

@ -1 +1 @@
Subproject commit 79bb21e389d52cf2e2b8a45ac9fd0913ce38035a
Subproject commit d0c4801aec9dcde4d4db7a961c1c895ec9f57205

2
src/support/spidermonkey/rust-mozjs

@ -1 +1 @@
Subproject commit d932f5dbb26dbae9fc67615bd61c86b05f0fb4fe
Subproject commit d8313b9c8ef2018afd24ab0914a86191630c2423