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

Fix breakage

Browse source
This commit is contained in:
Brian Anderson 2012-09-06 13:31:54 -07:00
parent 97ebc6311a
commit bee5f6bfc7
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rust-azure

@ -1 +1 @@
Subproject commit 949311085306aa9a0a31698dc001f8a3c5dfe798
Subproject commit 34a6c78cce40e9e01f330cf1324672d65d94a97b

2
src/rust-http-client

@ -1 +1 @@
Subproject commit 398b829caf64e1e809da4f387976ff359368127b
Subproject commit c99d5825e3a7ad782acfad82cc17d3a2fea0e39b

2
src/rust-layers

@ -1 +1 @@
Subproject commit 412e8ec69827031b59af4e35215c6b18fd25e8be
Subproject commit 51832ea94b0ffcd21b6bfba37ad969284c41a07b

3
src/servo/resource/resource_task.rs
View file

@ -10,6 +10,7 @@ export ResourceTask, ResourceManager, LoaderTaskFactory;
import comm::{Chan, Port};
import task::{spawn, spawn_listener};
import std::net::url;
import std::net::url::{Url, to_str};
enum ControlMsg {
@ -136,7 +137,7 @@ fn test_bad_scheme() {
#[allow(non_implicitly_copyable_typarams)]
fn should_delegate_to_scheme_loader() {
let payload = ~[1, 2, 3];
let loader_factory = fn~(+_url: url, progress_chan: Chan<ProgressMsg>, copy payload) {
let loader_factory = fn~(+_url: Url, progress_chan: Chan<ProgressMsg>, copy payload) {
progress_chan.send(Payload(copy payload));
progress_chan.send(Done(Ok(())));
};

2
src/servo/text/native_font/ft_native_font.rs
View file

@ -49,7 +49,7 @@ struct FreeTypeNativeFont/& {
if res.succeeded() {
unsafe {
let void_glyph = (*self.face).glyph;
let slot: FT_GlyphSlot = reinterpret_cast(void_glyph);
let slot: FT_GlyphSlot = reinterpret_cast(&void_glyph);
assert slot.is_not_null();
let advance = (*slot).metrics.horiAdvance;
#debug("h_advance for %? is %?", glyph, advance);