diff options
Diffstat (limited to 'components/servo')
| -rw-r--r-- | components/servo/Cargo.lock | 11 | ||||
| -rw-r--r-- | components/servo/lib.rs | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 5c7cfa15cc4..4183d8627e9 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -69,6 +69,11 @@ dependencies = [ ] [[package]] +name = "clock_ticks" +version = "0.0.4" +source = "git+https://github.com/tomaka/clock_ticks#6a3005279bedc406b13eea09ff92447f05ca0de6" + +[[package]] name = "cocoa" version = "0.1.1" source = "git+https://github.com/servo/rust-cocoa#ca3441a14783aa0683e073f1a1f990ed21900718" @@ -315,6 +320,7 @@ dependencies = [ "script_traits 0.0.1", "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", + "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", "style 0.0.1", "time 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", @@ -503,6 +509,7 @@ dependencies = [ "azure 0.1.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", + "clock_ticks 0.0.4 (git+https://github.com/tomaka/clock_ticks)", "cssparser 0.2.0 (git+https://github.com/servo/rust-cssparser)", "encoding 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", @@ -815,7 +822,7 @@ source = "git+https://github.com/servo/rust-stb-image#b683cc9e7ba52a1bb65361347d [[package]] name = "string_cache" version = "0.0.0" -source = "git+https://github.com/servo/string-cache#8c05fdf456a0e4f884e85d7e3a7700b2e4ca91eb" +source = "git+https://github.com/servo/string-cache#124cb555651bd7838c5c6dc4788bc4f5350947a9" dependencies = [ "lazy_static 0.1.8 (git+https://github.com/Kimundi/lazy-static.rs)", "phf 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -827,7 +834,7 @@ dependencies = [ [[package]] name = "string_cache_plugin" version = "0.0.0" -source = "git+https://github.com/servo/string-cache#8c05fdf456a0e4f884e85d7e3a7700b2e4ca91eb" +source = "git+https://github.com/servo/string-cache#124cb555651bd7838c5c6dc4788bc4f5350947a9" dependencies = [ "lazy_static 0.1.8 (git+https://github.com/Kimundi/lazy-static.rs)", "mac 0.0.2 (git+https://github.com/reem/rust-mac)", diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 1afdbf8dca5..b197ad30e6f 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -33,7 +33,7 @@ use msg::constellation_msg::ConstellationChan; use script::dom::bindings::codegen::RegisterBindings; #[cfg(not(test))] -use net::image_cache_task::ImageCacheTask; +use net::image_cache_task::{ImageCacheTask, LoadPlaceholder}; #[cfg(not(test))] use net::resource_task::new_resource_task; #[cfg(not(test))] @@ -84,10 +84,10 @@ impl Browser { // image. let image_cache_task = if opts.output_file.is_some() { ImageCacheTask::new_sync(resource_task.clone(), shared_task_pool, - time_profiler_chan.clone()) + time_profiler_chan.clone(), LoadPlaceholder::Preload) } else { ImageCacheTask::new(resource_task.clone(), shared_task_pool, - time_profiler_chan.clone()) + time_profiler_chan.clone(), LoadPlaceholder::Preload) }; let font_cache_task = FontCacheTask::new(resource_task.clone()); |