From 57f63b350e241fb65af2bc37004218db5f50713e Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Sun, 6 Apr 2014 02:53:33 +0530 Subject: [PATCH 1/2] fix visibility warnings in main crate (#2044) --- src/components/main/constellation.rs | 8 ++++---- src/components/main/css/matching.rs | 4 ++-- src/components/main/layout/construct.rs | 6 +++--- src/components/main/layout/flow.rs | 4 ++-- src/components/main/layout/inline.rs | 2 +- src/components/main/layout/model.rs | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/main/constellation.rs b/src/components/main/constellation.rs index 38efb084963..091b69b64e2 100644 --- a/src/components/main/constellation.rs +++ b/src/components/main/constellation.rs @@ -52,7 +52,7 @@ pub struct Constellation { } /// Stores the Id of the outermost frame's pipeline, along with a vector of children frames -struct FrameTree { +pub struct FrameTree { pipeline: RefCell>, parent: RefCell>>, children: RefCell<~[ChildFrameTree]>, @@ -74,7 +74,7 @@ impl Clone for FrameTree { } } -struct ChildFrameTree { +pub struct ChildFrameTree { frame_tree: Rc, /// Clipping rect representing the size and position, in page coordinates, of the visible /// region of the child frame relative to the parent. @@ -176,14 +176,14 @@ impl Iterator> for FrameTreeIterator { } /// Represents the portion of a page that is changing in navigating. -struct FrameChange { +pub struct FrameChange { before: Option, after: Rc, navigation_type: NavigationType, } /// Stores the Id's of the pipelines previous and next in the browser's history -struct NavigationContext { +pub struct NavigationContext { previous: ~[Rc], next: ~[Rc], current: Option>, diff --git a/src/components/main/css/matching.rs b/src/components/main/css/matching.rs index cb60e0d9781..f84b4b53738 100644 --- a/src/components/main/css/matching.rs +++ b/src/components/main/css/matching.rs @@ -50,7 +50,7 @@ impl ApplicableDeclarations { } #[deriving(Clone)] -struct ApplicableDeclarationsCacheEntry { +pub struct ApplicableDeclarationsCacheEntry { declarations: SmallVec16, } @@ -159,7 +159,7 @@ pub struct StyleSharingCandidateCache { } #[deriving(Clone)] -struct StyleSharingCandidate { +pub struct StyleSharingCandidate { style: Arc, parent_style: Arc, diff --git a/src/components/main/layout/construct.rs b/src/components/main/layout/construct.rs index 398f915197b..82026d28bce 100644 --- a/src/components/main/layout/construct.rs +++ b/src/components/main/layout/construct.rs @@ -98,7 +98,7 @@ impl ConstructionResult { /// Represents the output of flow construction for a DOM node that has not yet resulted in a /// complete flow. Construction items bubble up the tree until they find a `Flow` to be /// attached to. -enum ConstructionItem { +pub enum ConstructionItem { /// Inline boxes and associated {ib} splits that have not yet found flows. InlineBoxesConstructionItem(InlineBoxesConstructionResult), /// Potentially ignorable whitespace. @@ -124,7 +124,7 @@ impl ConstructionItem { } /// Represents inline boxes and {ib} splits that are bubbling up from an inline. -struct InlineBoxesConstructionResult { +pub struct InlineBoxesConstructionResult { /// Any {ib} splits that we're bubbling up. /// /// TODO(pcwalton): Small vector optimization. @@ -159,7 +159,7 @@ struct InlineBoxesConstructionResult { /// }),~[ /// C /// ]) -struct InlineBlockSplit { +pub struct InlineBlockSplit { /// The inline boxes that precede the flow. /// /// TODO(pcwalton): Small vector optimization. diff --git a/src/components/main/layout/flow.rs b/src/components/main/layout/flow.rs index 2fd6b310d86..1e5ab33ab37 100644 --- a/src/components/main/layout/flow.rs +++ b/src/components/main/layout/flow.rs @@ -718,9 +718,9 @@ impl Descendants { pub type AbsDescendants = Descendants; -type DescendantIter<'a> = MutItems<'a, Rawlink>; +pub type DescendantIter<'a> = MutItems<'a, Rawlink>; -type DescendantOffsetIter<'a> = Zip, MutItems<'a, Au>>; +pub type DescendantOffsetIter<'a> = Zip, MutItems<'a, Au>>; /// Data common to all flows. pub struct BaseFlow { diff --git a/src/components/main/layout/inline.rs b/src/components/main/layout/inline.rs index 940d2b50d95..a504031b69b 100644 --- a/src/components/main/layout/inline.rs +++ b/src/components/main/layout/inline.rs @@ -50,7 +50,7 @@ use style::computed_values::{text_align, vertical_align, white_space}; /// with a float or a horizontal wall of the containing block. The top /// left corner of the green zone is the same as that of the line, but /// the green zone can be taller and wider than the line itself. -struct LineBox { +pub struct LineBox { range: Range, bounds: Rect, green_zone: Size2D diff --git a/src/components/main/layout/model.rs b/src/components/main/layout/model.rs index 098e238a252..fac209ac770 100644 --- a/src/components/main/layout/model.rs +++ b/src/components/main/layout/model.rs @@ -231,7 +231,7 @@ impl MarginCollapseInfo { } } -enum MarginCollapseState { +pub enum MarginCollapseState { AccumulatingCollapsibleTopMargin, AccumulatingMarginIn, } From c397c5233d1e09eeb0ab4b43ecbf5c566a241864 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Sun, 6 Apr 2014 02:53:55 +0530 Subject: [PATCH 2/2] fix visibility warnings in script crate (#2044) --- src/components/script/dom/domexception.rs | 2 +- src/components/script/dom/eventtarget.rs | 2 +- src/components/script/dom/formdata.rs | 2 +- src/components/script/dom/node.rs | 2 +- src/components/script/dom/nodelist.rs | 2 +- src/components/script/html/hubbub_html_parser.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/script/dom/domexception.rs b/src/components/script/dom/domexception.rs index fe439a944e2..1c44a88af1f 100644 --- a/src/components/script/dom/domexception.rs +++ b/src/components/script/dom/domexception.rs @@ -11,7 +11,7 @@ use servo_util::str::DOMString; #[repr(uint)] #[deriving(Show, Encodable)] -enum DOMErrorName { +pub enum DOMErrorName { IndexSizeError = DOMExceptionConstants::INDEX_SIZE_ERR, HierarchyRequestError = DOMExceptionConstants::HIERARCHY_REQUEST_ERR, WrongDocumentError = DOMExceptionConstants::WRONG_DOCUMENT_ERR, diff --git a/src/components/script/dom/eventtarget.rs b/src/components/script/dom/eventtarget.rs index a1a3a9d7514..8d622ca0f0a 100644 --- a/src/components/script/dom/eventtarget.rs +++ b/src/components/script/dom/eventtarget.rs @@ -26,7 +26,7 @@ pub enum EventTargetTypeId { } #[deriving(Eq,Encodable)] -struct EventListenerEntry { +pub struct EventListenerEntry { phase: ListenerPhase, listener: EventListener } diff --git a/src/components/script/dom/formdata.rs b/src/components/script/dom/formdata.rs index ac6cdac403e..db380af6a55 100644 --- a/src/components/script/dom/formdata.rs +++ b/src/components/script/dom/formdata.rs @@ -14,7 +14,7 @@ use servo_util::str::DOMString; use collections::hashmap::HashMap; #[deriving(Encodable)] -enum FormDatum { +pub enum FormDatum { StringData(DOMString), BlobData { blob: JS, name: DOMString } } diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 0a35b5b6b0d..c9a9ebcc4c2 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -573,7 +573,7 @@ impl NodeHelpers for JS { // Iteration and traversal // -type ChildElementIterator<'a> = Map<'a, JS, +pub type ChildElementIterator<'a> = Map<'a, JS, JS, Filter<'a, JS, AbstractNodeChildrenIterator>>; diff --git a/src/components/script/dom/nodelist.rs b/src/components/script/dom/nodelist.rs index ab2bbb7f575..396fbad9c82 100644 --- a/src/components/script/dom/nodelist.rs +++ b/src/components/script/dom/nodelist.rs @@ -9,7 +9,7 @@ use dom::node::{Node, NodeHelpers}; use dom::window::Window; #[deriving(Encodable)] -enum NodeListType { +pub enum NodeListType { Simple(~[JS]), Children(JS) } diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs index e2a870c2bc9..e331f53cef0 100644 --- a/src/components/script/html/hubbub_html_parser.rs +++ b/src/components/script/html/hubbub_html_parser.rs @@ -50,7 +50,7 @@ pub struct JSFile { url: Url } -type JSResult = ~[JSFile]; +pub type JSResult = ~[JSFile]; enum CSSMessage { CSSTaskNewFile(StylesheetProvenance),