From 3b4beff064bd8a7156e7ff5eeba7812f1ae99418 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 8 Oct 2012 15:45:39 -0700 Subject: [PATCH] Update submodules --- src/libcss | 2 +- src/libhubbub | 2 +- src/libparserutils | 2 +- src/libwapcaplet | 2 +- src/rust-azure | 2 +- src/rust-geom | 2 +- src/rust-glut | 2 +- src/rust-http-client | 2 +- src/rust-hubbub | 2 +- src/rust-layers | 2 +- src/rust-opengles | 2 +- src/rust-stb-image | 2 +- src/servo-sandbox | 2 +- src/servo/dom/bindings/window.rs | 2 +- src/servo/gfx/png_compositor.rs | 2 +- src/servo/gfx/render_task.rs | 4 +- src/servo/platform/osmain.rs | 72 ++++++++++++++++---------------- src/servo/text/glyph.rs | 2 +- src/sharegl | 2 +- 19 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/libcss b/src/libcss index 6eaf88a838f..e86543f5f41 160000 --- a/src/libcss +++ b/src/libcss @@ -1 +1 @@ -Subproject commit 6eaf88a838f5c68e38c491b439b7464652647c25 +Subproject commit e86543f5f41108b1765087dfa2b11bdc159facf4 diff --git a/src/libhubbub b/src/libhubbub index e34e5f67f3d..653d132c50f 160000 --- a/src/libhubbub +++ b/src/libhubbub @@ -1 +1 @@ -Subproject commit e34e5f67f3de6135865a99a4a545c1f78c2e67a3 +Subproject commit 653d132c50f7f38b39515fba898b2f0a459c97df diff --git a/src/libparserutils b/src/libparserutils index 21f20640bbc..af039dd4bde 160000 --- a/src/libparserutils +++ b/src/libparserutils @@ -1 +1 @@ -Subproject commit 21f20640bbc609a580f7a289b6407240ae98754a +Subproject commit af039dd4bdeaf56f42b443307c250a66255e9334 diff --git a/src/libwapcaplet b/src/libwapcaplet index a7985f7732d..55674ee31bd 160000 --- a/src/libwapcaplet +++ b/src/libwapcaplet @@ -1 +1 @@ -Subproject commit a7985f7732da1fa3e87087863c041c5b49ef6a8d +Subproject commit 55674ee31bd6312482bb26a9c68a18a366f57c8c diff --git a/src/rust-azure b/src/rust-azure index 5b57a6efee7..9331dc2047f 160000 --- a/src/rust-azure +++ b/src/rust-azure @@ -1 +1 @@ -Subproject commit 5b57a6efee711ed399d9c0d158a86857d0b96060 +Subproject commit 9331dc2047f88020df9fd9543a7115aa42b04a16 diff --git a/src/rust-geom b/src/rust-geom index e56e41dc94e..381c2ff5853 160000 --- a/src/rust-geom +++ b/src/rust-geom @@ -1 +1 @@ -Subproject commit e56e41dc94e8f8083d484866fcc22d44b7eb2efe +Subproject commit 381c2ff5853992f9146c9cb90e2f774c869b79f8 diff --git a/src/rust-glut b/src/rust-glut index 2886e54d623..e3de0827a4e 160000 --- a/src/rust-glut +++ b/src/rust-glut @@ -1 +1 @@ -Subproject commit 2886e54d6230050ee7a25e590faad969f95a7d16 +Subproject commit e3de0827a4e18d5a650470f6947861d10e9be59c diff --git a/src/rust-http-client b/src/rust-http-client index 8cab62f8095..44099faab1a 160000 --- a/src/rust-http-client +++ b/src/rust-http-client @@ -1 +1 @@ -Subproject commit 8cab62f8095e7c99b858da256f4f7042d57d9712 +Subproject commit 44099faab1a257f2163df07fb2f711d7f8b66d82 diff --git a/src/rust-hubbub b/src/rust-hubbub index 546e7973848..64ee4d0bd79 160000 --- a/src/rust-hubbub +++ b/src/rust-hubbub @@ -1 +1 @@ -Subproject commit 546e797384821679fe45f8fe549fc8735ba24617 +Subproject commit 64ee4d0bd794ca73392fc4ad65aea47bbf313c27 diff --git a/src/rust-layers b/src/rust-layers index 4d916307330..df7170d88fd 160000 --- a/src/rust-layers +++ b/src/rust-layers @@ -1 +1 @@ -Subproject commit 4d916307330d5b7e5818c87d3aebda175477b9ae +Subproject commit df7170d88fd114f4c4aeb0a9d35e5f69ff8778e9 diff --git a/src/rust-opengles b/src/rust-opengles index 74a86cbf861..593cb2cf964 160000 --- a/src/rust-opengles +++ b/src/rust-opengles @@ -1 +1 @@ -Subproject commit 74a86cbf8616b34b4fce4891fad21a181a253545 +Subproject commit 593cb2cf964eded5af750384409fc672881dc5f1 diff --git a/src/rust-stb-image b/src/rust-stb-image index 5907c48bf0e..992835bcc37 160000 --- a/src/rust-stb-image +++ b/src/rust-stb-image @@ -1 +1 @@ -Subproject commit 5907c48bf0e77562735b8a2fab286a6e5c33a20c +Subproject commit 992835bcc37a1bcc579412e2920aeaa99ded73d1 diff --git a/src/servo-sandbox b/src/servo-sandbox index c1a3cd94ee7..02c14417dd0 160000 --- a/src/servo-sandbox +++ b/src/servo-sandbox @@ -1 +1 @@ -Subproject commit c1a3cd94ee7ea21d27b9a90d1576417dc3d8edbf +Subproject commit 02c14417dd0b51f1e19ef5c63b50b3d6cd80455b diff --git a/src/servo/dom/bindings/window.rs b/src/servo/dom/bindings/window.rs index 128f8126b92..ebe70ab3ecb 100644 --- a/src/servo/dom/bindings/window.rs +++ b/src/servo/dom/bindings/window.rs @@ -45,7 +45,7 @@ extern fn setTimeout(cx: *JSContext, argc: c_uint, vp: *jsval) -> JSBool unsafe return 1; } -extern fn close(cx: *JSContext, argc: c_uint, vp: *jsval) -> JSBool unsafe { +extern fn close(cx: *JSContext, _argc: c_uint, vp: *jsval) -> JSBool unsafe { (*unwrap(JS_THIS_OBJECT(cx, vp))).payload.close(); JS_SET_RVAL(cx, vp, JSVAL_NULL); return 1; diff --git a/src/servo/gfx/png_compositor.rs b/src/servo/gfx/png_compositor.rs index 2fd89948765..2984219f664 100644 --- a/src/servo/gfx/png_compositor.rs +++ b/src/servo/gfx/png_compositor.rs @@ -51,7 +51,7 @@ impl Chan : Compositor { pub fn PngCompositor(output: Chan<~[u8]>) -> PngCompositor { do spawn_listener |po: Port| { let cairo_surface = ImageSurface(CAIRO_FORMAT_ARGB32, 800, 600); - let draw_target = Cell(DrawTarget(cairo_surface)); + let draw_target = Cell(DrawTarget(&cairo_surface)); loop { match po.recv() { diff --git a/src/servo/gfx/render_task.rs b/src/servo/gfx/render_task.rs index 2a4383c9e39..b6d385a9e85 100644 --- a/src/servo/gfx/render_task.rs +++ b/src/servo/gfx/render_task.rs @@ -114,7 +114,7 @@ pub fn draw_solid_color(ctx: &RenderContext, bounds: &Rect, r: u8, g: u8, b: b.to_float() as AzFloat, 1f as AzFloat); - ctx.canvas.fill_rect(bounds.to_azure_rect(), ColorPattern(color)); + ctx.canvas.fill_rect(&bounds.to_azure_rect(), &ColorPattern(color)); } pub fn draw_image(ctx: &RenderContext, bounds: Rect, image: ARC<~Image>) { @@ -263,5 +263,5 @@ fn get_cairo_font(font: &Font) -> *cairo_scaled_font_t { fn clear(ctx: &RenderContext) { let pattern = ColorPattern(Color(1f as AzFloat, 1f as AzFloat, 1f as AzFloat, 1f as AzFloat)); let rect = Rect(Point2D(0 as AzFloat, 0 as AzFloat), Size2D(800 as AzFloat, 600 as AzFloat)); - ctx.canvas.fill_rect(rect, pattern); + ctx.canvas.fill_rect(&rect, &pattern); } diff --git a/src/servo/platform/osmain.rs b/src/servo/platform/osmain.rs index 3a2214ef9a2..2ed8fe3587b 100644 --- a/src/servo/platform/osmain.rs +++ b/src/servo/platform/osmain.rs @@ -82,9 +82,9 @@ fn mainloop(+mode: Mode, po: comm::Port) { let image = @layers::layers::Image(0, 0, layers::layers::RGB24Format, ~[]); let image_layer = @layers::layers::ImageLayer(image); image_layer.common.set_transform - (image_layer.common.transform.scale(800.0f32, 600.0f32, 1.0f32)); + (image_layer.common.transform.scale(&800.0f32, &600.0f32, &1.0f32)); - let scene = @mut layers::scene::Scene(layers::layers::ImageLayerKind(image_layer), + let scene = @layers::scene::Scene(layers::layers::ImageLayerKind(image_layer), Size2D(800.0f32, 600.0f32)); let done = @mut false; @@ -119,46 +119,46 @@ fn mainloop(+mode: Mode, po: comm::Port) { } }; - match window { - GlutWindow(window) => { - do glut::reshape_func(window) |width, height| { - check_for_messages(); + match window { + GlutWindow(window) => { + do glut::reshape_func(window) |width, height| { + check_for_messages(); - #debug("osmain: window resized to %d,%d", width as int, height as int); - for event_listeners.each |event_listener| { - event_listener.send(ResizeEvent(width as int, height as int)); - } - } + #debug("osmain: window resized to %d,%d", width as int, height as int); + for event_listeners.each |event_listener| { + event_listener.send(ResizeEvent(width as int, height as int)); + } + } - do glut::display_func() { - check_for_messages(); + do glut::display_func() { + check_for_messages(); - #debug("osmain: drawing to screen"); + #debug("osmain: drawing to screen"); - do util::time::time(~"compositing") { - layers::rendergl::render_scene(context, *scene); - } + do util::time::time(~"compositing") { + layers::rendergl::render_scene(context, scene); + } - glut::swap_buffers(); - glut::post_redisplay(); - } + glut::swap_buffers(); + glut::post_redisplay(); + } - while !*done { - #debug("osmain: running GLUT check loop"); - glut::check_loop(); - } - } - ShareWindow(share_context) => { - loop { - check_for_messages(); - do util::time::time(~"compositing") { - layers::rendergl::render_scene(context, *scene); - } + while !*done { + #debug("osmain: running GLUT check loop"); + glut::check_loop(); + } + } + ShareWindow(share_context) => { + loop { + check_for_messages(); + do util::time::time(~"compositing") { + layers::rendergl::render_scene(context, scene); + } - share_context.flush(); - } - } - } + share_context.flush(); + } + } + } } #[doc = " @@ -222,7 +222,7 @@ struct Surface { fn Surface() -> Surface { let cairo_surface = ImageSurface(cairo::CAIRO_FORMAT_RGB24, 800, 600); - let draw_target = DrawTarget(cairo_surface); + let draw_target = DrawTarget(&cairo_surface); Surface { cairo_surface: cairo_surface, draw_target: draw_target, have: true } } diff --git a/src/servo/text/glyph.rs b/src/servo/text/glyph.rs index ee9703db2c2..792c248712c 100644 --- a/src/servo/text/glyph.rs +++ b/src/servo/text/glyph.rs @@ -305,7 +305,7 @@ struct GlyphStore { // Initializes the glyph store, but doesn't actually shape anything. // Use the set_glyph, set_glyphs() methods to store glyph data. // Use the get_glyph_data method to retrieve glyph data for a char.. -fn GlyphStore(text: ~str) { +fn GlyphStore(_text: ~str) { } diff --git a/src/sharegl b/src/sharegl index 26ddabc2021..f32389a766c 160000 --- a/src/sharegl +++ b/src/sharegl @@ -1 +1 @@ -Subproject commit 26ddabc20216428b66e182795dbcd5782d0e9d4f +Subproject commit f32389a766c6777ebb09fa61efffb6e4471e453a