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

Eliminate more warnings

Browse source
This commit is contained in:
Brian Anderson 2012-10-08 18:56:49 -07:00
parent d2bc5aaf8f
commit ed4db46505
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/servo/html/hubbub_html_parser.rs
View file

@ -166,7 +166,7 @@ fn build_element_kind(tag: &str) -> ~ElementKind {
} }
pub fn parse_html(scope: NodeScope, pub fn parse_html(scope: NodeScope,
url: Url, +url: Url,
resource_task: ResourceTask, resource_task: ResourceTask,
image_cache_task: ImageCacheTask) -> HtmlParserResult unsafe { image_cache_task: ImageCacheTask) -> HtmlParserResult unsafe {
// Spawn a CSS parser to receive links to CSS style sheets. // Spawn a CSS parser to receive links to CSS style sheets.
@ -183,7 +183,7 @@ pub fn parse_html(scope: NodeScope,
js_script_listener(js_chan, js_port, resource_task); js_script_listener(js_chan, js_port, resource_task);
}; };
let (scope, url) = (@copy scope, @copy url); let (scope, url) = (@copy scope, @url);
// Build the root node. // Build the root node.
let root = scope.new_node(Element(ElementData(~"html", ~HTMLDivElement))); let root = scope.new_node(Element(ElementData(~"html", ~HTMLDivElement)));

12
src/servo/platform/osmain.rs
View file

@ -101,11 +101,11 @@ fn mainloop(+mode: Mode, po: comm::Port<Msg>) {
match po.recv() { match po.recv() {
AddKeyHandler(move key_ch) => key_handlers.push(move key_ch), AddKeyHandler(move key_ch) => key_handlers.push(move key_ch),
AddEventListener(event_listener) => event_listeners.push(event_listener), AddEventListener(event_listener) => event_listeners.push(event_listener),
BeginDrawing(sender) => lend_surface(*surfaces, sender), BeginDrawing(move sender) => lend_surface(surfaces, sender),
Draw(sender, dt) => { Draw(move sender, move dt) => {
#debug("osmain: received new frame"); #debug("osmain: received new frame");
return_surface(*surfaces, dt); return_surface(surfaces, dt);
lend_surface(*surfaces, sender); lend_surface(surfaces, sender);
let buffer = surfaces.front.cairo_surface.data(); let buffer = surfaces.front.cairo_surface.data();
let image = @layers::layers::Image(800, 600, layers::layers::ARGB32Format, let image = @layers::layers::Image(800, 600, layers::layers::ARGB32Format,
@ -182,7 +182,7 @@ struct SurfaceSet {
mut back: Surface, mut back: Surface,
} }
fn lend_surface(surfaces: SurfaceSet, receiver: pipes::Chan<DrawTarget>) { fn lend_surface(surfaces: &SurfaceSet, +receiver: pipes::Chan<DrawTarget>) {
// We are in a position to lend out the surface? // We are in a position to lend out the surface?
assert surfaces.front.have; assert surfaces.front.have;
// Ok then take it // Ok then take it
@ -197,7 +197,7 @@ fn lend_surface(surfaces: SurfaceSet, receiver: pipes::Chan<DrawTarget>) {
assert surfaces.front.have; assert surfaces.front.have;
} }
fn return_surface(surfaces: SurfaceSet, draw_target: DrawTarget) { fn return_surface(surfaces: &SurfaceSet, +draw_target: DrawTarget) {
#debug("osmain: returning surface %?", draw_target); #debug("osmain: returning surface %?", draw_target);
// We have room for a return // We have room for a return
assert surfaces.front.have; assert surfaces.front.have;

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

@ -73,7 +73,7 @@ pub struct ResourceManager {
pub fn ResourceManager(from_client: Port<ControlMsg>, pub fn ResourceManager(from_client: Port<ControlMsg>,
loaders: ~[(~str, LoaderTaskFactory)]) -> ResourceManager { +loaders: ~[(~str, LoaderTaskFactory)]) -> ResourceManager {
ResourceManager { ResourceManager {
from_client : from_client, from_client : from_client,
loaders : loaders, loaders : loaders,
@ -97,7 +97,7 @@ impl ResourceManager {
fn load(+url: Url, progress_chan: Chan<ProgressMsg>) { fn load(+url: Url, progress_chan: Chan<ProgressMsg>) {
match self.get_loader_factory(url) { match self.get_loader_factory(&url) {
Some(loader_factory) => { Some(loader_factory) => {
#debug("resource_task: loading url: %s", to_str(copy url)); #debug("resource_task: loading url: %s", to_str(copy url));
loader_factory(url, progress_chan); loader_factory(url, progress_chan);
@ -109,7 +109,7 @@ impl ResourceManager {
} }
} }
fn get_loader_factory(url: Url) -> Option<LoaderTaskFactory> { fn get_loader_factory(url: &Url) -> Option<LoaderTaskFactory> {
for self.loaders.each |scheme_loader| { for self.loaders.each |scheme_loader| {
let (scheme, loader_factory) = copy *scheme_loader; let (scheme, loader_factory) = copy *scheme_loader;
if scheme == url.scheme { if scheme == url.scheme {

4
src/servo/text/text_run.rs
View file

@ -120,7 +120,7 @@ impl TextRun {
} }
} }
fn TextRun(font: &Font, text: ~str) -> TextRun { fn TextRun(font: &Font, +text: ~str) -> TextRun {
let glyph_store = GlyphStore(text); let glyph_store = GlyphStore(text);
let run = TextRun { let run = TextRun {
text: text, text: text,
@ -154,7 +154,7 @@ fn test_calc_min_break_width() {
#[test] #[test]
#[ignore] #[ignore]
fn test_iter_indivisible_pieces() { fn test_iter_indivisible_pieces() {
fn test_pieces(text: ~str, res: ~[~str]) { fn test_pieces(+text: ~str, +res: ~[~str]) {
let flib = FontCache(); let flib = FontCache();
let font = flib.get_test_font(); let font = flib.get_test_font();
let run = TextRun(font, copy text); let run = TextRun(font, copy text);