diff --git a/src/components/compositing/compositing.rs b/src/components/compositing/compositing.rs index 737acce3b84..b944567549d 100644 --- a/src/components/compositing/compositing.rs +++ b/src/components/compositing/compositing.rs @@ -47,15 +47,15 @@ extern crate core_text; pub use compositor_task::{CompositorChan, CompositorTask}; pub use constellation::Constellation; -mod compositor_task; +pub mod compositor_task; mod compositor_data; mod compositor; mod headless; -mod pipeline; -mod constellation; +pub mod pipeline; +pub mod constellation; mod windowing; diff --git a/src/components/compositing/compositor_task.rs b/src/components/compositing/compositor_task.rs index faf34915a84..1b8e9653744 100644 --- a/src/components/compositing/compositor_task.rs +++ b/src/components/compositing/compositor_task.rs @@ -6,7 +6,7 @@ pub use windowing; use compositor; use headless; -use constellation::SendableFrameTree; +pub use constellation::SendableFrameTree; use windowing::{ApplicationMethods, WindowMethods}; use platform::Application; diff --git a/src/components/compositing/constellation.rs b/src/components/compositing/constellation.rs index f5215be1555..f6d12ebcedd 100644 --- a/src/components/compositing/constellation.rs +++ b/src/components/compositing/constellation.rs @@ -42,7 +42,7 @@ pub struct Constellation { pub compositor_chan: CompositorChan, pub resource_task: ResourceTask, pub image_cache_task: ImageCacheTask, - pub pipelines: HashMap>, + pipelines: HashMap>, navigation_context: NavigationContext, next_pipeline_id: PipelineId, pending_frames: Vec, diff --git a/src/components/compositing/platform/common/glfw_windowing.rs b/src/components/compositing/platform/common/glfw_windowing.rs index ca42af1f13f..ae4eaf57bb6 100644 --- a/src/components/compositing/platform/common/glfw_windowing.rs +++ b/src/components/compositing/platform/common/glfw_windowing.rs @@ -85,22 +85,22 @@ macro_rules! glfw_callback( /// The type of a window. pub struct Window { - pub glfw: glfw::Glfw, + glfw: glfw::Glfw, - pub glfw_window: glfw::Window, - pub events: Receiver<(f64, glfw::WindowEvent)>, + glfw_window: glfw::Window, + events: Receiver<(f64, glfw::WindowEvent)>, - pub event_queue: RefCell>, + event_queue: RefCell>, - pub drag_origin: Point2D, + drag_origin: Point2D, - pub mouse_down_button: Cell>, - pub mouse_down_point: Cell>, + mouse_down_button: Cell>, + mouse_down_point: Cell>, - pub ready_state: Cell, - pub render_state: Cell, + ready_state: Cell, + render_state: Cell, - pub last_title_set_time: Cell, + last_title_set_time: Cell, } impl WindowMethods for Window {