aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-01-18 01:58:01 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-01-18 01:58:01 +0530
commit380541bd48bb7ce0b36a8be90f756734e531ca5f (patch)
treed25e3bf41d2d18859b09afc23fde1107a27d7567
parent7f16b4e47bf8aef035ea788d80172dfd1a11ecff (diff)
parent8ecc1202117f2bfec7ebc0b4769db996b8ab5c57 (diff)
downloadservo-380541bd48bb7ce0b36a8be90f756734e531ca5f.tar.gz
servo-380541bd48bb7ce0b36a8be90f756734e531ca5f.zip
Auto merge of #9352 - mattkuo:cleanup-private-types, r=nox
Convert private types to public fixes #9347 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9352) <!-- Reviewable:end -->
-rw-r--r--components/compositing/compositor.rs8
-rw-r--r--components/devtools/actor.rs2
-rw-r--r--components/devtools/actors/root.rs2
-rw-r--r--components/gfx/platform/freetype/font_context.rs2
4 files changed, 7 insertions, 7 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index c2c38f7bc97..84d101ac9d1 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -54,14 +54,14 @@ use util::print_tree::PrintTree;
use windowing::{self, MouseWindowEvent, WindowEvent, WindowMethods, WindowNavigateMsg};
#[derive(Debug, PartialEq)]
-enum UnableToComposite {
+pub enum UnableToComposite {
NoContext,
WindowUnprepared,
NotReadyToPaintImage(NotReadyToPaint),
}
#[derive(Debug, PartialEq)]
-enum NotReadyToPaint {
+pub enum NotReadyToPaint {
LayerHasOutstandingPaintMessages,
MissingRoot,
PendingSubpages(usize),
@@ -225,7 +225,7 @@ struct HitTestResult {
point: TypedPoint2D<LayerPixel, f32>,
}
-struct PipelineDetails {
+pub struct PipelineDetails {
/// The pipeline associated with this PipelineDetails object.
pipeline: Option<CompositionPipeline>,
@@ -251,7 +251,7 @@ impl PipelineDetails {
}
#[derive(Clone, Copy, PartialEq, Debug)]
-enum CompositeTarget {
+pub enum CompositeTarget {
/// Normal composition to a window
Window,
diff --git a/components/devtools/actor.rs b/components/devtools/actor.rs
index fccd2a0b8a5..a309ff6ccf3 100644
--- a/components/devtools/actor.rs
+++ b/components/devtools/actor.rs
@@ -31,7 +31,7 @@ pub trait Actor: Any + ActorAsAny {
fn name(&self) -> String;
}
-trait ActorAsAny {
+pub trait ActorAsAny {
fn actor_as_any(&self) -> &Any;
fn actor_as_any_mut(&mut self) -> &mut Any;
}
diff --git a/components/devtools/actors/root.rs b/components/devtools/actors/root.rs
index 5b83a56476a..0a589db3466 100644
--- a/components/devtools/actors/root.rs
+++ b/components/devtools/actors/root.rs
@@ -35,7 +35,7 @@ struct ListTabsReply {
}
#[derive(RustcEncodable)]
-struct RootActorMsg {
+pub struct RootActorMsg {
from: String,
applicationType: String,
traits: ActorTraits,
diff --git a/components/gfx/platform/freetype/font_context.rs b/components/gfx/platform/freetype/font_context.rs
index 0bb1137a472..05cbd0675f6 100644
--- a/components/gfx/platform/freetype/font_context.rs
+++ b/components/gfx/platform/freetype/font_context.rs
@@ -18,7 +18,7 @@ use util::mem::{HeapSizeOf, heap_size_of};
// We pass a |User| struct -- via an opaque |void*| -- to FreeType each time a new instance is
// created. FreeType passes it back to the ft_alloc/ft_realloc/ft_free callbacks. We use it to
// record the memory usage of each FreeType instance.
-struct User {
+pub struct User {
size: usize,
}