auto merge of #1738 : saneyuki/servo/opt, r=kmcallister

I think gfx/opts.rs should be placed to more general place.

src/components/gfx/gfx.rs

@@ -54,7 +54,6 @@ pub mod font_context;
 pub mod font_list;
 
 // Misc.
-pub mod opts;
 mod buffer_map;
 
 // Platform-specific implementations.

src/components/gfx/render_context.rs

@@ -4,7 +4,6 @@
 
 use font_context::FontContext;
 use style::computed_values::border_style;
-use opts::Opts;
 
 use azure::azure_hl::{B8G8R8A8, Color, ColorPattern, DrawOptions};
 use azure::azure_hl::{DrawSurfaceOptions, DrawTarget, Linear, StrokeOptions};
@@ -18,6 +17,7 @@ use geom::side_offsets::SideOffsets2D;
 use servo_net::image::base::Image;
 use png::{RGBA8, K8, KA8};
 use servo_util::geometry::Au;
+use servo_util::opts::Opts;
 use std::libc::types::common::c99::uint16_t;
 use std::libc::size_t;
 

src/components/gfx/render_task.rs

@@ -17,6 +17,7 @@ use servo_msg::compositor_msg::{RenderListener, RenderingRenderState};
 use servo_msg::constellation_msg::{ConstellationChan, PipelineId, RendererReadyMsg};
 use servo_msg::constellation_msg::{Failure, FailureMsg};
 use servo_msg::platform::surface::NativeSurfaceAzureMethods;
+use servo_util::opts::Opts;
 use servo_util::time::{ProfilerChan, profile};
 use servo_util::time;
 use servo_util::task::send_on_failure;
@@ -28,7 +29,6 @@ use extra::arc::Arc;
 use buffer_map::BufferMap;
 use display_list::DisplayListCollection;
 use font_context::{FontContext, FontContextInfo};
-use opts::Opts;
 use render_context::RenderContext;
 
 pub struct RenderLayer<T> {

src/components/main/compositing/compositor.rs

@@ -23,7 +23,6 @@ use geom::matrix::identity;
 use geom::point::Point2D;
 use geom::rect::Rect;
 use geom::size::Size2D;
-use gfx::opts::Opts;
 use layers::layers::{ContainerLayer, ContainerLayerKind};
 use layers::platform::surface::NativeCompositingGraphicsContext;
 use layers::rendergl;
@@ -34,6 +33,7 @@ use png;
 use servo_msg::compositor_msg::{Blank, Epoch, FinishedLoading, IdleRenderState, LayerBufferSet, ReadyState, RenderState};
 use servo_msg::constellation_msg::{ConstellationChan, ExitMsg, NavigateMsg, ResizedWindowMsg, LoadUrlMsg, PipelineId};
 use servo_msg::constellation_msg;
+use servo_util::opts::Opts;
 use servo_util::time::{profile, ProfilerChan, Timer};
 use servo_util::{time, url};
 use std::comm::Port;

src/components/main/compositing/compositor_task.rs

@@ -12,11 +12,11 @@ use azure::azure_hl::{SourceSurfaceMethods, Color};
 use geom::point::Point2D;
 use geom::rect::Rect;
 use geom::size::Size2D;
-use gfx::opts::Opts;
 use layers::platform::surface::{NativeCompositingGraphicsContext, NativeGraphicsMetadata};
 use servo_msg::compositor_msg::{Epoch, RenderListener, LayerBufferSet, RenderState, ReadyState};
 use servo_msg::compositor_msg::{ScriptListener, Tile};
 use servo_msg::constellation_msg::{ConstellationChan, PipelineId};
+use servo_util::opts::Opts;
 use servo_util::time::ProfilerChan;
 use std::comm::{Chan, SharedChan, Port};
 use std::num::Orderable;

src/components/main/constellation.rs

@@ -7,7 +7,6 @@ use compositing::{CompositorChan, LoadComplete, SetIds, SetLayerClipRect, Shutdo
 use extra::url::Url;
 use geom::rect::Rect;
 use geom::size::Size2D;
-use gfx::opts::Opts;
 use gfx::render_task;
 use pipeline::{Pipeline, CompositionPipeline};
 use script::script_task::{ResizeMsg, ResizeInactiveMsg, ExitPipelineMsg};
@@ -21,6 +20,7 @@ use servo_msg::constellation_msg;
 use servo_net::image_cache_task::{ImageCacheTask, ImageCacheTaskClient};
 use servo_net::resource_task::ResourceTask;
 use servo_net::resource_task;
+use servo_util::opts::Opts;
 use servo_util::time::ProfilerChan;
 use servo_util::url::parse_url;
 use servo_util::task::spawn_named;

src/components/main/layout/layout_task.rs

@@ -29,7 +29,6 @@ use geom::size::Size2D;
 use gfx::display_list::{ClipDisplayItemClass, DisplayItem, DisplayItemIterator};
 use gfx::display_list::{DisplayList, DisplayListCollection};
 use gfx::font_context::FontContextInfo;
-use gfx::opts::Opts;
 use gfx::render_task::{RenderMsg, RenderChan, RenderLayer};
 use gfx::{render_task, color};
 use script::dom::bindings::js::JS;
@@ -47,6 +46,7 @@ use servo_msg::constellation_msg::{ConstellationChan, PipelineId, Failure, Failu
 use servo_net::image_cache_task::{ImageCacheTask, ImageResponseMsg};
 use servo_net::local_image_cache::{ImageResponder, LocalImageCache};
 use servo_util::geometry::Au;
+use servo_util::opts::Opts;
 use servo_util::time::{ProfilerChan, profile};
 use servo_util::time;
 use servo_util::task::send_on_failure;

src/components/main/pipeline.rs

@@ -7,7 +7,6 @@ use layout::layout_task::LayoutTask;
 
 use extra::url::Url;
 use geom::size::Size2D;
-use gfx::opts::Opts;
 use gfx::render_task::{PaintPermissionGranted, PaintPermissionRevoked};
 use gfx::render_task::{RenderChan, RenderTask};
 use layout::util::OpaqueNode;
@@ -18,6 +17,7 @@ use script::script_task;
 use servo_msg::constellation_msg::{ConstellationChan, Failure, PipelineId, SubpageId};
 use servo_net::image_cache_task::ImageCacheTask;
 use servo_net::resource_task::ResourceTask;
+use servo_util::opts::Opts;
 use servo_util::time::ProfilerChan;
 use std::cell::RefCell;
 //FIXME: switch to std::rc when we upgrade Rust

src/components/main/servo.rs

@@ -46,9 +46,6 @@ use constellation::Constellation;
 #[cfg(not(test))]
 use servo_msg::constellation_msg::InitLoadUrlMsg;
 
-#[cfg(not(test))]
-use gfx::opts;
-
 #[cfg(not(test))]
 use servo_net::image_cache_task::{ImageCacheTask, SyncImageCacheTask};
 #[cfg(not(test))]
@@ -56,9 +53,10 @@ use servo_net::resource_task::ResourceTask;
 #[cfg(not(test))]
 use servo_util::time::Profiler;
 
-pub use gfx::opts::Opts;
-pub use gfx::text;
-pub use servo_util::url::parse_url;
+#[cfg(not(test))]
+use servo_util::opts;
+#[cfg(not(test))]
+use servo_util::url::parse_url;
 
 #[cfg(not(test))]
 use std::os;
@@ -138,7 +136,7 @@ pub extern "C" fn android_start(argc: int, argv: **u8) -> int {
 }
 
 #[cfg(not(test))]
-fn run(opts: Opts) {
+fn run(opts: opts::Opts) {
     let mut pool = green::SchedPool::new(green::PoolConfig::new());
 
     let (compositor_port, compositor_chan) = CompositorChan::new();

src/components/util/util.rs

@@ -7,6 +7,7 @@
 
 #[feature(macro_rules, managed_boxes)];
 
+extern mod azure;
 extern mod extra;
 extern mod geom;
 extern mod native;
@@ -18,6 +19,7 @@ pub mod debug;
 pub mod geometry;
 pub mod io;
 pub mod namespace;
+pub mod opts;
 pub mod range;
 pub mod smallvec;
 pub mod sort;