mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Fix breakage
This commit is contained in:
parent
97ebc6311a
commit
bee5f6bfc7
5 changed files with 6 additions and 5 deletions
|
@ -1 +1 @@
|
||||||
Subproject commit 949311085306aa9a0a31698dc001f8a3c5dfe798
|
Subproject commit 34a6c78cce40e9e01f330cf1324672d65d94a97b
|
|
@ -1 +1 @@
|
||||||
Subproject commit 398b829caf64e1e809da4f387976ff359368127b
|
Subproject commit c99d5825e3a7ad782acfad82cc17d3a2fea0e39b
|
|
@ -1 +1 @@
|
||||||
Subproject commit 412e8ec69827031b59af4e35215c6b18fd25e8be
|
Subproject commit 51832ea94b0ffcd21b6bfba37ad969284c41a07b
|
|
@ -10,6 +10,7 @@ export ResourceTask, ResourceManager, LoaderTaskFactory;
|
||||||
|
|
||||||
import comm::{Chan, Port};
|
import comm::{Chan, Port};
|
||||||
import task::{spawn, spawn_listener};
|
import task::{spawn, spawn_listener};
|
||||||
|
import std::net::url;
|
||||||
import std::net::url::{Url, to_str};
|
import std::net::url::{Url, to_str};
|
||||||
|
|
||||||
enum ControlMsg {
|
enum ControlMsg {
|
||||||
|
@ -136,7 +137,7 @@ fn test_bad_scheme() {
|
||||||
#[allow(non_implicitly_copyable_typarams)]
|
#[allow(non_implicitly_copyable_typarams)]
|
||||||
fn should_delegate_to_scheme_loader() {
|
fn should_delegate_to_scheme_loader() {
|
||||||
let payload = ~[1, 2, 3];
|
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(Payload(copy payload));
|
||||||
progress_chan.send(Done(Ok(())));
|
progress_chan.send(Done(Ok(())));
|
||||||
};
|
};
|
||||||
|
|
|
@ -49,7 +49,7 @@ struct FreeTypeNativeFont/& {
|
||||||
if res.succeeded() {
|
if res.succeeded() {
|
||||||
unsafe {
|
unsafe {
|
||||||
let void_glyph = (*self.face).glyph;
|
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();
|
assert slot.is_not_null();
|
||||||
let advance = (*slot).metrics.horiAdvance;
|
let advance = (*slot).metrics.horiAdvance;
|
||||||
#debug("h_advance for %? is %?", glyph, advance);
|
#debug("h_advance for %? is %?", glyph, advance);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue