mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Fixes for language changes
This commit is contained in:
parent
f76755a671
commit
55b3aa2673
23 changed files with 39 additions and 39 deletions
|
@ -1 +1 @@
|
|||
Subproject commit 85b33524fb4190be04cd4f7e2a0b80afc162c248
|
||||
Subproject commit 7ecba6aa7afd69ad970b2a041367a295d8307998
|
|
@ -1 +1 @@
|
|||
Subproject commit 8a44a579cf421b6bc7a97b1c1e81bd9ede5d84a4
|
||||
Subproject commit 5019635e3f44851c08716bd44b70229b2d625aa7
|
|
@ -1 +1 @@
|
|||
Subproject commit 97addf5f319171f3318129bdd47fbee264c983b9
|
||||
Subproject commit f0bda24a03245e2f917b287d5d850621d2d56c56
|
|
@ -1 +1 @@
|
|||
Subproject commit b21169d50a7a69dd77a15edfef37d552dd0a4a83
|
||||
Subproject commit e1ec99049c193aaedbb603e4ceb675251e5814b3
|
|
@ -1 +1 @@
|
|||
Subproject commit 2ac740959ba4560141ae6b45a2a1d175fa9c6b42
|
||||
Subproject commit 43dff406cc21f46a2b14707ecfe347be149b375f
|
|
@ -1 +1 @@
|
|||
Subproject commit 889260799c84f2e3bb23f44927a902dfd430abf3
|
||||
Subproject commit fa1de008eb31d9401dbc3d6232d6fa4e87d54da3
|
|
@ -1 +1 @@
|
|||
Subproject commit 705cea457cc490794439fd2fdb38d154a3bed659
|
||||
Subproject commit 402d663658c6f10da2769fa9cbd406160bc89e67
|
|
@ -1 +1 @@
|
|||
Subproject commit 18375fd31cde66d0f0204de8c6c15870ca32b05b
|
||||
Subproject commit 425d4598525f43de331c017f0c8408954dcbd66b
|
|
@ -1 +1 @@
|
|||
Subproject commit f36b299ef516e9c8d22eb162986b9f6e266c9769
|
||||
Subproject commit 4ff373b328f646d1ff1c9e67337bd284ff0fddda
|
|
@ -1 +1 @@
|
|||
Subproject commit c74cefb9dc45f577b6f174c6a7fe83bfcf3f150a
|
||||
Subproject commit de66662c301b2c00dacabdf0d82adf22d16232b4
|
|
@ -1 +1 @@
|
|||
Subproject commit 9b1ecfc7a889bf0f8f2fca63a4634767f7704f42
|
||||
Subproject commit 7a847f44e8fe93f16749fade574c8e76d51b2b6d
|
|
@ -1 +1 @@
|
|||
Subproject commit 6d727c72da467c70852610f8c7899b2d795b59e9
|
||||
Subproject commit 60b6a4ec1d2bd63b24383fe31865552d7eedada4
|
|
@ -97,7 +97,7 @@ fn init(compartment: bare_compartment, doc: @Document) {
|
|||
getter: {op: getDocumentElement, info: null()},
|
||||
setter: {op: null(), info: null()}}];
|
||||
vec::push(compartment.global_props, attrs);
|
||||
vec::as_buf(*attrs, |specs, _len| {
|
||||
vec::as_imm_buf(*attrs, |specs, _len| {
|
||||
assert JS_DefineProperties(compartment.cx.ptr, obj.ptr, specs) == 1;
|
||||
});
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ fn init(compartment: bare_compartment) {
|
|||
getter: {op: getTagName, info: null()},
|
||||
setter: {op: null(), info: null()}}];
|
||||
vec::push(compartment.global_props, attrs);
|
||||
vec::as_buf(*attrs, |specs, _len| {
|
||||
vec::as_imm_buf(*attrs, |specs, _len| {
|
||||
JS_DefineProperties(compartment.cx.ptr, obj.ptr, specs);
|
||||
});
|
||||
|
||||
|
@ -56,7 +56,7 @@ fn init(compartment: bare_compartment) {
|
|||
getter: {op: HTMLImageElement_getWidth, info: null()},
|
||||
setter: {op: HTMLImageElement_setWidth, info: null()}}];
|
||||
vec::push(compartment.global_props, attrs);
|
||||
vec::as_buf(*attrs, |specs, _len| {
|
||||
vec::as_imm_buf(*attrs, |specs, _len| {
|
||||
JS_DefineProperties(compartment.cx.ptr, obj.ptr, specs);
|
||||
});
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ fn init(compartment: bare_compartment) {
|
|||
getter: {op: getNodeType, info: null()},
|
||||
setter: {op: null(), info: null()}}];
|
||||
vec::push(compartment.global_props, attrs);
|
||||
vec::as_buf(*attrs, |specs, _len| {
|
||||
vec::as_imm_buf(*attrs, |specs, _len| {
|
||||
JS_DefineProperties(compartment.cx.ptr, obj.ptr, specs);
|
||||
});
|
||||
}
|
||||
|
|
|
@ -50,7 +50,7 @@ fn jsval_to_str(cx: *JSContext, v: jsval) -> Result<~str, ()> {
|
|||
Err(())
|
||||
} else {
|
||||
unsafe {
|
||||
let buf = vec::unsafe::from_buf(chars as *u8, len as uint);
|
||||
let buf = vec::raw::from_buf(chars as *u8, len as uint);
|
||||
Ok(str::from_bytes(buf))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -103,7 +103,7 @@ fn init(compartment: bare_compartment, win: @Window) {
|
|||
flags: 0,
|
||||
selfHostedName: null()}];
|
||||
|
||||
vec::as_buf(methods, |fns, _len| {
|
||||
vec::as_imm_buf(methods, |fns, _len| {
|
||||
JS_DefineFunctions(compartment.cx.ptr, proto.ptr, fns);
|
||||
});
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ use render_task::{RenderTask, RenderMsg};
|
|||
use task::spawn_listener;
|
||||
use comm::{Chan, Port};
|
||||
use unsafe::reinterpret_cast;
|
||||
use vec_from_buf = vec::unsafe::from_buf;
|
||||
use vec_from_buf = vec::raw::from_buf;
|
||||
use ptr::addr_of;
|
||||
use dom::event::Event;
|
||||
use dvec::DVec;
|
||||
|
@ -75,7 +75,7 @@ fn do_draw(sender: pipes::Chan<DrawTarget>,
|
|||
let buffer = io::mem_buffer();
|
||||
cairo_surface.write_to_png_stream(&buffer);
|
||||
let @{ buf: buffer, pos: _ } <- buffer;
|
||||
output.send(vec::from_mut(dvec::unwrap(move buffer)));
|
||||
output.send(dvec::unwrap(move buffer));
|
||||
|
||||
// Send the next draw target to the renderer
|
||||
sender.send(move dt);
|
||||
|
|
|
@ -120,7 +120,7 @@ pub fn draw_image(draw_target: &DrawTarget, bounds: Rect<au>, image: ARC<~Image>
|
|||
|
||||
pub fn draw_text(draw_target: &DrawTarget, bounds: Rect<au>, text_run: &TextRun) {
|
||||
use ptr::{addr_of, null};
|
||||
use vec::unsafe::to_ptr;
|
||||
use vec::raw::to_ptr;
|
||||
use libc::types::common::c99::{uint16_t, uint32_t};
|
||||
use geom::point::Point2D;
|
||||
use text::font_library::FontLibrary;
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
#[license = "MPL"];
|
||||
#[crate_type = "lib"];
|
||||
|
||||
use std;
|
||||
use azure;
|
||||
use js;
|
||||
use stb_image;
|
||||
use geom;
|
||||
use glut;
|
||||
use layers;
|
||||
use opengles;
|
||||
use http_client;
|
||||
use hubbub;
|
||||
extern mod std;
|
||||
extern mod azure;
|
||||
extern mod js;
|
||||
extern mod stb_image;
|
||||
extern mod geom;
|
||||
extern mod glut;
|
||||
extern mod layers;
|
||||
extern mod opengles;
|
||||
extern mod http_client;
|
||||
extern mod hubbub;
|
||||
|
||||
mod engine;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
export Font, test_font_bin, create_test_font;
|
||||
|
||||
use glyph::GlyphIndex;
|
||||
use vec_to_ptr = vec::unsafe::to_ptr;
|
||||
use vec_to_ptr = vec::raw::to_ptr;
|
||||
use libc::{ c_int, c_double, c_ulong };
|
||||
use ptr::{ null, addr_of };
|
||||
use native_font::NativeFont;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use cocoa;
|
||||
extern mod cocoa;
|
||||
|
||||
export QuartzNativeFont, with_test_native_font, create;
|
||||
|
||||
|
@ -84,8 +84,8 @@ impl QuartzNativeFont {
|
|||
let glyphs: ~[mut CGGlyph] = ~[mut 0 as CGGlyph];
|
||||
let count: CFIndex = 1;
|
||||
|
||||
let result = do vec::as_buf(characters) |character_buf, _l| {
|
||||
do vec::as_buf(glyphs) |glyph_buf, _l| {
|
||||
let result = do vec::as_imm_buf(characters) |character_buf, _l| {
|
||||
do vec::as_imm_buf(glyphs) |glyph_buf, _l| {
|
||||
CTFontGetGlyphsForCharacters(ctfont, character_buf, glyph_buf, count)
|
||||
}
|
||||
};
|
||||
|
@ -109,7 +109,7 @@ impl QuartzNativeFont {
|
|||
let ctfont = ctfont_from_cgfont(self.cgfont);
|
||||
assert ctfont.is_not_null();
|
||||
let glyphs = ~[glyph as CGGlyph];
|
||||
let advance = do vec::as_buf(glyphs) |glyph_buf, _l| {
|
||||
let advance = do vec::as_imm_buf(glyphs) |glyph_buf, _l| {
|
||||
CTFontGetAdvancesForGlyphs(ctfont, kCTFontDefaultOrientation, glyph_buf, null(), 1)
|
||||
};
|
||||
|
||||
|
@ -128,7 +128,7 @@ fn ctfont_from_cgfont(cgfont: CGFontRef) -> coretext::CTFontRef {
|
|||
}
|
||||
|
||||
fn create(buf: &~[u8]) -> Result<QuartzNativeFont, ()> {
|
||||
let fontprov = vec::as_buf(*buf, |cbuf, len| {
|
||||
let fontprov = vec::as_imm_buf(*buf, |cbuf, len| {
|
||||
CGDataProviderCreateWithData(
|
||||
null(),
|
||||
unsafe { transmute(copy cbuf) },
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use harfbuzz;
|
||||
extern mod harfbuzz;
|
||||
|
||||
export shape_text;
|
||||
|
||||
|
@ -39,7 +39,7 @@ when rendered in a specific font.
|
|||
fn shape_text(font: &Font, text: ~str) -> ~[Glyph] unsafe {
|
||||
#debug("shaping text '%s'", text);
|
||||
|
||||
let face_blob = vec::as_buf(*(*font).buf(), |buf, len| {
|
||||
let face_blob = vec::as_imm_buf(*(*font).buf(), |buf, len| {
|
||||
hb_blob_create(reinterpret_cast(&buf),
|
||||
len as c_uint,
|
||||
HB_MEMORY_MODE_READONLY,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue