diff options
85 files changed, 2814 insertions, 2428 deletions
diff --git a/README.md b/README.md index a51eb95d171..a577b2b5d3b 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ sudo apt-get install git curl freeglut3-dev autoconf \ libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \ gperf g++ build-essential cmake virtualenv python-pip \ libssl-dev libbz2-dev libosmesa6-dev libxmu6 libxmu-dev \ - libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev + libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev ``` If you are on **Ubuntu 14.04** and encountered errors on installing these dependencies involving `libcheese`, see [#6158](https://github.com/servo/servo/issues/6158) for a workaround. diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 450951c99f1..35b6c8133b6 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -633,7 +633,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { debug!("delayed composition timeout!"); if let CompositionRequest::DelayedComposite(this_timestamp) = self.composition_request { - if timestamp == this_timestamp && !opts::get().use_webrender { + if timestamp == this_timestamp { self.composition_request = CompositionRequest::CompositeNow( CompositingReason::DelayedCompositeTimeout) } @@ -752,7 +752,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { match animation_state { AnimationState::AnimationsPresent => { self.pipeline_details(pipeline_id).animations_running = true; - self.composite_if_necessary_if_not_using_webrender(CompositingReason::Animation); + self.composite_if_necessary(CompositingReason::Animation); } AnimationState::AnimationCallbacksPresent => { if !self.pipeline_details(pipeline_id).animation_callbacks_running { @@ -1350,12 +1350,11 @@ impl<Window: WindowMethods> IOCompositor<Window> { Some(root_pipeline_id) => root_pipeline_id, None => return, }; - let root_pipeline = match self.pipeline(root_pipeline_id) { - Some(root_pipeline) => root_pipeline, - None => return, - }; + if self.pipeline(root_pipeline_id).is_none() { + return; + } - let translated_point = + let (translated_point, translated_pipeline_id) = webrender_api.translate_point_to_layer_space(&point.to_untyped()); let event_to_send = match mouse_window_event { MouseWindowEvent::Click(button, _) => { @@ -1368,9 +1367,12 @@ impl<Window: WindowMethods> IOCompositor<Window> { MouseButtonEvent(MouseEventType::MouseUp, button, translated_point) } }; - let msg = ConstellationControlMsg::SendEvent(root_pipeline_id, event_to_send); - if let Err(e) = root_pipeline.script_chan.send(msg) { - warn!("Sending control event to root script failed ({}).", e); + let translated_pipeline_id = translated_pipeline_id.from_webrender(); + let msg = ConstellationControlMsg::SendEvent(translated_pipeline_id, event_to_send); + if let Some(pipeline) = self.pipeline(translated_pipeline_id) { + if let Err(e) = pipeline.script_chan.send(msg) { + warn!("Sending control event to script failed ({}).", e); + } } return } @@ -1392,17 +1394,19 @@ impl<Window: WindowMethods> IOCompositor<Window> { Some(root_pipeline_id) => root_pipeline_id, None => return, }; - let root_pipeline = match self.pipeline(root_pipeline_id) { - Some(root_pipeline) => root_pipeline, - None => return, - }; + if self.pipeline(root_pipeline_id).is_none() { + return; + } - let translated_point = + let (translated_point, translated_pipeline_id) = webrender_api.translate_point_to_layer_space(&cursor.to_untyped()); + let translated_pipeline_id = translated_pipeline_id.from_webrender(); let event_to_send = MouseMoveEvent(Some(translated_point)); - let msg = ConstellationControlMsg::SendEvent(root_pipeline_id, event_to_send); - if let Err(e) = root_pipeline.script_chan.send(msg) { - warn!("Sending mouse control event to root script failed ({}).", e); + let msg = ConstellationControlMsg::SendEvent(translated_pipeline_id, event_to_send); + if let Some(pipeline) = self.pipeline(translated_pipeline_id) { + if let Err(e) = pipeline.script_chan.send(msg) { + warn!("Sending mouse control event to script failed ({}).", e); + } } return } @@ -1662,9 +1666,12 @@ impl<Window: WindowMethods> IOCompositor<Window> { /// necessary. fn perform_updates_after_scroll(&mut self) { self.send_updated_display_ports_to_layout(); + if opts::get().use_webrender { + return + } if self.send_buffer_requests_for_all_layers() { self.schedule_delayed_composite_if_necessary(); - } else if !opts::get().use_webrender { + } else { self.channel_to_self.send(Msg::Recomposite(CompositingReason::ContinueScroll)); } } diff --git a/components/gfx/text/text_run.rs b/components/gfx/text/text_run.rs index 10cced11166..7dd0b027839 100644 --- a/components/gfx/text/text_run.rs +++ b/components/gfx/text/text_run.rs @@ -272,7 +272,14 @@ impl<'a> TextRun { }) } - /// Returns the index of the first glyph run containing the given byte index. + pub fn minimum_splittable_inline_size(&self, range: &Range<ByteIndex>) -> Au { + match self.natural_word_slices_in_range(range).next() { + None => Au(0), + Some(slice) => self.advance_for_range(&slice.range), + } + } + + /// Returns the index of the first glyph run containing the given character index. fn index_of_first_glyph_run_containing(&self, index: ByteIndex) -> Option<usize> { let self_ptr = self as *const TextRun; INDEX_OF_FIRST_GLYPH_RUN_CACHE.with(|index_of_first_glyph_run_cache| { diff --git a/components/layout/block.rs b/components/layout/block.rs index 987a3038e9b..fa5790306b5 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -33,7 +33,8 @@ use display_list_builder::BlockFlowDisplayListBuilding; use display_list_builder::{BorderPaintingMode, DisplayListBuildState, FragmentDisplayListBuilding}; use euclid::{Point2D, Rect, Size2D}; use floats::{ClearType, FloatKind, Floats, PlacementInfo}; -use flow::{BLOCK_POSITION_IS_STATIC, CLEARS_LEFT, CLEARS_RIGHT, INLINE_POSITION_IS_STATIC}; +use flow::{BLOCK_POSITION_IS_STATIC, CLEARS_LEFT, CLEARS_RIGHT}; +use flow::{CONTAINS_TEXT_OR_REPLACED_FRAGMENTS, INLINE_POSITION_IS_STATIC}; use flow::{IS_ABSOLUTELY_POSITIONED}; use flow::{ImmutableFlowUtils, LateAbsolutePositionInfo, MutableFlowUtils, OpaqueFlow}; use flow::{NEEDS_LAYER, PostorderFlowTraversal, PreorderFlowTraversal, FragmentationContext}; @@ -1473,61 +1474,89 @@ impl BlockFlow { } } - /// Computes intrinsic widths for a block. + /// Computes intrinsic inline sizes for a block. pub fn bubble_inline_sizes_for_block(&mut self, consult_children: bool) { let _scope = layout_debug_scope!("block::bubble_inline_sizes {:x}", self.base.debug_id()); - let flags = self.base.flags; + let mut flags = self.base.flags; + if self.definitely_has_zero_block_size() { + // This is kind of a hack for Acid2. But it's a harmless one, because (a) this behavior + // is unspecified; (b) it matches the behavior one would intuitively expect, since + // floats don't flow around blocks that take up no space in the block direction. + flags.remove(CONTAINS_TEXT_OR_REPLACED_FRAGMENTS); + } else if self.fragment.is_text_or_replaced() { + flags.insert(CONTAINS_TEXT_OR_REPLACED_FRAGMENTS); + } else { + flags.remove(CONTAINS_TEXT_OR_REPLACED_FRAGMENTS); + for kid in self.base.children.iter() { + if flow::base(kid).flags.contains(CONTAINS_TEXT_OR_REPLACED_FRAGMENTS) { + flags.insert(CONTAINS_TEXT_OR_REPLACED_FRAGMENTS); + break + } + } + } // Find the maximum inline-size from children. + // + // See: https://lists.w3.org/Archives/Public/www-style/2014Nov/0085.html + // + // FIXME(pcwalton): This doesn't exactly follow that algorithm at the moment. + // FIXME(pcwalton): This should consider all float descendants, not just children. let mut computation = self.fragment.compute_intrinsic_inline_sizes(); let (mut left_float_width, mut right_float_width) = (Au(0), Au(0)); let (mut left_float_width_accumulator, mut right_float_width_accumulator) = (Au(0), Au(0)); + let mut preferred_inline_size_of_children_without_text_or_replaced_fragments = Au(0); for kid in self.base.child_iter_mut() { - let is_absolutely_positioned = - flow::base(kid).flags.contains(IS_ABSOLUTELY_POSITIONED); + if flow::base(kid).flags.contains(IS_ABSOLUTELY_POSITIONED) || !consult_children { + continue + } + let child_base = flow::mut_base(kid); let float_kind = child_base.flags.float_kind(); - if !is_absolutely_positioned && consult_children { - computation.content_intrinsic_sizes.minimum_inline_size = - max(computation.content_intrinsic_sizes.minimum_inline_size, - child_base.intrinsic_inline_sizes.minimum_inline_size); - - if child_base.flags.contains(CLEARS_LEFT) { - left_float_width = max(left_float_width, left_float_width_accumulator); - left_float_width_accumulator = Au(0) + computation.content_intrinsic_sizes.minimum_inline_size = + max(computation.content_intrinsic_sizes.minimum_inline_size, + child_base.intrinsic_inline_sizes.minimum_inline_size); + + if child_base.flags.contains(CLEARS_LEFT) { + left_float_width = max(left_float_width, left_float_width_accumulator); + left_float_width_accumulator = Au(0) + } + if child_base.flags.contains(CLEARS_RIGHT) { + right_float_width = max(right_float_width, right_float_width_accumulator); + right_float_width_accumulator = Au(0) + } + + match (float_kind, child_base.flags.contains(CONTAINS_TEXT_OR_REPLACED_FRAGMENTS)) { + (float::T::none, true) => { + computation.content_intrinsic_sizes.preferred_inline_size = + max(computation.content_intrinsic_sizes.preferred_inline_size, + child_base.intrinsic_inline_sizes.preferred_inline_size); } - if child_base.flags.contains(CLEARS_RIGHT) { - right_float_width = max(right_float_width, right_float_width_accumulator); - right_float_width_accumulator = Au(0) + (float::T::none, false) => { + preferred_inline_size_of_children_without_text_or_replaced_fragments = max( + preferred_inline_size_of_children_without_text_or_replaced_fragments, + child_base.intrinsic_inline_sizes.preferred_inline_size) } - - match float_kind { - float::T::none => { - computation.content_intrinsic_sizes.preferred_inline_size = - max(computation.content_intrinsic_sizes.preferred_inline_size, - child_base.intrinsic_inline_sizes.preferred_inline_size); - } - float::T::left => { - left_float_width_accumulator = left_float_width_accumulator + - child_base.intrinsic_inline_sizes.preferred_inline_size; - } - float::T::right => { - right_float_width_accumulator = right_float_width_accumulator + - child_base.intrinsic_inline_sizes.preferred_inline_size; - } + (float::T::left, _) => { + left_float_width_accumulator = left_float_width_accumulator + + child_base.intrinsic_inline_sizes.preferred_inline_size; + } + (float::T::right, _) => { + right_float_width_accumulator = right_float_width_accumulator + + child_base.intrinsic_inline_sizes.preferred_inline_size; } } } - // FIXME(pcwalton): This should consider all float descendants, not just children. - // FIXME(pcwalton): This is not well-spec'd; INTRINSIC specifies to do this, but CSS-SIZING - // says not to. In practice, Gecko and WebKit both do this. left_float_width = max(left_float_width, left_float_width_accumulator); right_float_width = max(right_float_width, right_float_width_accumulator); + + computation.content_intrinsic_sizes.preferred_inline_size = + computation.content_intrinsic_sizes.preferred_inline_size + left_float_width + + right_float_width; computation.content_intrinsic_sizes.preferred_inline_size = max(computation.content_intrinsic_sizes.preferred_inline_size, - left_float_width + right_float_width); + preferred_inline_size_of_children_without_text_or_replaced_fragments); self.base.intrinsic_inline_sizes = computation.finish(); self.base.flags = flags @@ -1630,6 +1659,18 @@ impl BlockFlow { FormattingContextType::None | FormattingContextType::Other => {} } } + + fn definitely_has_zero_block_size(&self) -> bool { + if !self.fragment.style.content_block_size().is_definitely_zero() { + return false + } + let border_width = self.fragment.border_width(); + if border_width.block_start != Au(0) || border_width.block_end != Au(0) { + return false + } + let padding = self.fragment.style.logical_padding(); + padding.block_start.is_definitely_zero() && padding.block_end.is_definitely_zero() + } } impl Flow for BlockFlow { @@ -1654,7 +1695,7 @@ impl Flow for BlockFlow { fn bubble_inline_sizes(&mut self) { // If this block has a fixed width, just use that for the minimum and preferred width, // rather than bubbling up children inline width. - let consult_children = match self.fragment.style().get_box().width { + let consult_children = match self.fragment.style().get_position().width { LengthOrPercentageOrAuto::Length(_) => false, _ => true, }; diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 873be2b2743..dc6ca7b3cb1 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -686,7 +686,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> /// FIXME(pcwalton): It is not clear to me that there isn't a cleaner way to handle /// `<textarea>`. fn build_flow_for_block_like(&mut self, flow: FlowRef, node: &ConcreteThreadSafeLayoutNode) - -> ConstructionResult { + -> ConstructionResult { let mut initial_fragments = IntermediateInlineFragments::new(); let node_is_input_or_text_area = node.type_id() == Some(NodeTypeId::Element(ElementTypeId::HTMLElement( @@ -1023,7 +1023,8 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> /// This is an annoying case, because the computed `display` value is `block`, but the /// hypothetical box is inline. - fn build_fragment_for_absolutely_positioned_inline(&mut self, node: &ConcreteThreadSafeLayoutNode) + fn build_fragment_for_absolutely_positioned_inline(&mut self, + node: &ConcreteThreadSafeLayoutNode) -> ConstructionResult { let block_flow_result = self.build_flow_for_block(node, None); let (block_flow, abs_descendants) = match block_flow_result { @@ -1519,11 +1520,10 @@ impl<'a, ConcreteThreadSafeLayoutNode> PostorderNodeMutTraversal<ConcreteThreadS } Some(NodeTypeId::Element(_)) => { let style = node.style(self.style_context()); - let munged_display = if style.get_box()._servo_display_for_hypothetical_box == - display::T::inline { - display::T::inline - } else { - style.get_box().display + let original_display = style.get_box()._servo_display_for_hypothetical_box; + let munged_display = match original_display { + display::T::inline | display::T::inline_block => original_display, + _ => style.get_box().display, }; (munged_display, style.get_box().float, style.get_box().position) } @@ -1577,7 +1577,8 @@ impl<'a, ConcreteThreadSafeLayoutNode> PostorderNodeMutTraversal<ConcreteThreadS // Inline items that are absolutely-positioned contribute inline fragment construction // results with a hypothetical fragment. - (display::T::inline, _, position::T::absolute) => { + (display::T::inline, _, position::T::absolute) | + (display::T::inline_block, _, position::T::absolute) => { let construction_result = self.build_fragment_for_absolutely_positioned_inline(node); self.set_flow_construction_result(node, construction_result) diff --git a/components/layout/flex.rs b/components/layout/flex.rs index eed7ec8aae3..789018e4121 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -125,7 +125,7 @@ impl FlexFlow { // Currently, this is the core of BlockFlow::bubble_inline_sizes() with all float logic // stripped out, and max replaced with union_nonbreaking_inline. fn inline_mode_bubble_inline_sizes(&mut self) { - let fixed_width = match self.block_flow.fragment.style().get_box().width { + let fixed_width = match self.block_flow.fragment.style().get_position().width { LengthOrPercentageOrAuto::Length(_) => true, _ => false, }; @@ -151,7 +151,7 @@ impl FlexFlow { // Currently, this is the core of BlockFlow::bubble_inline_sizes() with all float logic // stripped out. fn block_mode_bubble_inline_sizes(&mut self) { - let fixed_width = match self.block_flow.fragment.style().get_box().width { + let fixed_width = match self.block_flow.fragment.style().get_position().width { LengthOrPercentageOrAuto::Length(_) => true, _ => false, }; @@ -398,9 +398,9 @@ impl Flow for FlexFlow { let (available_block_size, available_inline_size) = { let style = &self.block_flow.fragment.style; let (specified_block_size, specified_inline_size) = if style.writing_mode.is_vertical() { - (style.get_box().width, style.get_box().height) + (style.get_position().width, style.get_position().height) } else { - (style.get_box().height, style.get_box().width) + (style.get_position().height, style.get_position().width) }; let available_inline_size = AxisSize::new(specified_inline_size, diff --git a/components/layout/floats.rs b/components/layout/floats.rs index bd91acb657d..9a5d1521d58 100644 --- a/components/layout/floats.rs +++ b/components/layout/floats.rs @@ -11,6 +11,7 @@ use std::fmt; use std::i32; use style::computed_values::float; use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; +use style::values::computed::LengthOrPercentageOrAuto; /// The kind of float: left or right. #[derive(Clone, RustcEncodable, Debug, Copy)] @@ -78,7 +79,11 @@ impl FloatList { impl fmt::Debug for FloatList { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "max_block_start={:?} floats={}", self.max_block_start, self.floats.len()) + try!(write!(f, "max_block_start={:?} floats={}", self.max_block_start, self.floats.len())); + for float in self.floats.iter() { + try!(write!(f, " {:?}", float)); + } + Ok(()) } } @@ -490,14 +495,30 @@ impl SpeculatedFloatPlacement { } let base_flow = flow::base(flow); + if !base_flow.flags.is_float() { + return + } + + let mut float_inline_size = base_flow.intrinsic_inline_sizes.preferred_inline_size; + if float_inline_size == Au(0) { + if flow.is_block_like() { + // Hack: If the size of the float is a percentage, then there's no way we can guess + // at its size now. So just pick an arbitrary nonzero value (in this case, 1px) so + // that the layout traversal logic will know that objects later in the document + // might flow around this float. + if let LengthOrPercentageOrAuto::Percentage(percentage) = + flow.as_block().fragment.style.content_inline_size() { + if percentage > 0.0 { + float_inline_size = Au::from_px(1) + } + } + } + } + match base_flow.flags.float_kind() { float::T::none => {} - float::T::left => { - self.left = self.left + base_flow.intrinsic_inline_sizes.preferred_inline_size - } - float::T::right => { - self.right = self.right + base_flow.intrinsic_inline_sizes.preferred_inline_size - } + float::T::left => self.left = self.left + float_inline_size, + float::T::right => self.right = self.right + float_inline_size, } } diff --git a/components/layout/flow.rs b/components/layout/flow.rs index 9ca27c352ce..05e5814d0e0 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -512,6 +512,8 @@ pub trait ImmutableFlowUtils { /// Returns true if floats might flow through this flow, as determined by the float placement /// speculation pass. fn floats_might_flow_through(self) -> bool; + + fn baseline_offset_of_last_line_box_in_flow(self) -> Option<Au>; } pub trait MutableFlowUtils { @@ -634,45 +636,48 @@ bitflags! { #[doc = "Whether this flow must have its own layer. Even if this flag is not set, it might"] #[doc = "get its own layer if it's deemed to be likely to overlap flows with their own"] #[doc = "layer."] - const NEEDS_LAYER = 0b0000_0000_0000_0010_0000, + const NEEDS_LAYER = 0b0000_0000_0000_0000_0010_0000, #[doc = "Whether this flow is absolutely positioned. This is checked all over layout, so a"] #[doc = "virtual call is too expensive."] - const IS_ABSOLUTELY_POSITIONED = 0b0000_0000_0000_0100_0000, + const IS_ABSOLUTELY_POSITIONED = 0b0000_0000_0000_0000_0100_0000, #[doc = "Whether this flow clears to the left. This is checked all over layout, so a"] #[doc = "virtual call is too expensive."] - const CLEARS_LEFT = 0b0000_0000_0000_1000_0000, + const CLEARS_LEFT = 0b0000_0000_0000_0000_1000_0000, #[doc = "Whether this flow clears to the right. This is checked all over layout, so a"] #[doc = "virtual call is too expensive."] - const CLEARS_RIGHT = 0b0000_0000_0001_0000_0000, + const CLEARS_RIGHT = 0b0000_0000_0000_0001_0000_0000, #[doc = "Whether this flow is left-floated. This is checked all over layout, so a"] #[doc = "virtual call is too expensive."] - const FLOATS_LEFT = 0b0000_0000_0010_0000_0000, + const FLOATS_LEFT = 0b0000_0000_0000_0010_0000_0000, #[doc = "Whether this flow is right-floated. This is checked all over layout, so a"] #[doc = "virtual call is too expensive."] - const FLOATS_RIGHT = 0b0000_0000_0100_0000_0000, + const FLOATS_RIGHT = 0b0000_0000_0000_0100_0000_0000, #[doc = "Text alignment. \ NB: If you update this, update `TEXT_ALIGN_SHIFT` below."] - const TEXT_ALIGN = 0b0000_0111_1000_0000_0000, + const TEXT_ALIGN = 0b0000_0000_0111_1000_0000_0000, #[doc = "Whether this flow has a fragment with `counter-reset` or `counter-increment` \ styles."] - const AFFECTS_COUNTERS = 0b0000_1000_0000_0000_0000, + const AFFECTS_COUNTERS = 0b0000_0000_1000_0000_0000_0000, #[doc = "Whether this flow's descendants have fragments that affect `counter-reset` or \ `counter-increment` styles."] - const HAS_COUNTER_AFFECTING_CHILDREN = 0b0001_0000_0000_0000_0000, + const HAS_COUNTER_AFFECTING_CHILDREN = 0b0000_0001_0000_0000_0000_0000, #[doc = "Whether this flow behaves as though it had `position: static` for the purposes \ of positioning in the inline direction. This is set for flows with `position: \ static` and `position: relative` as well as absolutely-positioned flows with \ unconstrained positions in the inline direction."] - const INLINE_POSITION_IS_STATIC = 0b0010_0000_0000_0000_0000, + const INLINE_POSITION_IS_STATIC = 0b0000_0010_0000_0000_0000_0000, #[doc = "Whether this flow behaves as though it had `position: static` for the purposes \ of positioning in the block direction. This is set for flows with `position: \ static` and `position: relative` as well as absolutely-positioned flows with \ unconstrained positions in the block direction."] - const BLOCK_POSITION_IS_STATIC = 0b0100_0000_0000_0000_0000, + const BLOCK_POSITION_IS_STATIC = 0b0000_0100_0000_0000_0000_0000, /// Whether any ancestor is a fragmentation container - const CAN_BE_FRAGMENTED = 0b1000_0000_0000_0000_0000, + const CAN_BE_FRAGMENTED = 0b0000_1000_0000_0000_0000_0000, + + /// Whether this flow contains any text and/or replaced fragments. + const CONTAINS_TEXT_OR_REPLACED_FRAGMENTS = 0b0001_0000_0000_0000_0000_0000, } } @@ -975,9 +980,11 @@ impl fmt::Debug for BaseFlow { }; write!(f, - "sc={:?} pos={:?}, floatspec-in={:?}, floatspec-out={:?}, overflow={:?}{}{}{}", + "sc={:?} pos={:?}, {}{} floatspec-in={:?}, floatspec-out={:?}, overflow={:?}{}{}{}", self.stacking_context_id, self.position, + if self.flags.contains(FLOATS_LEFT) { "FL" } else { "" }, + if self.flags.contains(FLOATS_RIGHT) { "FR" } else { "" }, self.speculated_float_placement_in, self.speculated_float_placement_out, self.overflow, @@ -1387,6 +1394,21 @@ impl<'a> ImmutableFlowUtils for &'a Flow { } self.as_block().formatting_context_type() == FormattingContextType::None } + + fn baseline_offset_of_last_line_box_in_flow(self) -> Option<Au> { + for kid in base(self).children.iter().rev() { + if kid.is_inline_flow() { + return kid.as_inline().baseline_offset_of_last_line() + } + if kid.is_block_like() && + kid.as_block().formatting_context_type() == FormattingContextType::None { + if let Some(baseline_offset) = kid.baseline_offset_of_last_line_box_in_flow() { + return Some(base(kid).position.start.b + baseline_offset) + } + } + } + None + } } impl<'a> MutableFlowUtils for &'a mut Flow { diff --git a/components/layout/flow_list.rs b/components/layout/flow_list.rs index 85657db8acd..5a0d389f5da 100644 --- a/components/layout/flow_list.rs +++ b/components/layout/flow_list.rs @@ -111,6 +111,12 @@ impl<'a> Iterator for FlowListIterator<'a> { } } +impl<'a> DoubleEndedIterator for FlowListIterator<'a> { + fn next_back(&mut self) -> Option<&'a Flow> { + self.it.next_back().map(|x| &**x) + } +} + impl<'a> Iterator for MutFlowListIterator<'a> { type Item = &'a mut Flow; #[inline] diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index f90a18a438d..e0468b2f7c2 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -11,7 +11,7 @@ use canvas_traits::CanvasMsg; use context::LayoutContext; use euclid::{Point2D, Rect, Size2D}; use floats::ClearType; -use flow::{self, Flow}; +use flow::{self, Flow, ImmutableFlowUtils}; use flow_ref::{self, FlowRef}; use gfx; use gfx::display_list::{BLUR_INFLATION_FACTOR, FragmentType, OpaqueNode, StackingContextId}; @@ -38,7 +38,7 @@ use std::sync::{Arc, Mutex}; use style::computed_values::content::ContentItem; use style::computed_values::{border_collapse, clear, display, mix_blend_mode, overflow_wrap}; use style::computed_values::{overflow_x, position, text_decoration, transform_style}; -use style::computed_values::{white_space, word_break, z_index}; +use style::computed_values::{vertical_align, white_space, word_break, z_index}; use style::dom::TRestyleDamage; use style::logical_geometry::{LogicalMargin, LogicalRect, LogicalSize, WritingMode}; use style::properties::{ComputedValues, ServoComputedValues}; @@ -1031,7 +1031,8 @@ impl Fragment { let mut specified = Au(0); if flags.contains(INTRINSIC_INLINE_SIZE_INCLUDES_SPECIFIED) { - specified = MaybeAuto::from_style(style.content_inline_size(), Au(0)).specified_or_zero(); + specified = MaybeAuto::from_style(style.content_inline_size(), + Au(0)).specified_or_zero(); specified = max(model::specified(style.min_inline_size(), Au(0)), specified); if let Some(max) = model::specified_or_none(style.max_inline_size(), Au(0)) { specified = min(specified, max) @@ -1070,14 +1071,15 @@ impl Fragment { pub fn calculate_line_height(&self, layout_context: &LayoutContext) -> Au { let font_style = self.style.get_font_arc(); - let font_metrics = text::font_metrics_for_style(&mut layout_context.font_context(), font_style); + let font_metrics = text::font_metrics_for_style(&mut layout_context.font_context(), + font_style); text::line_height_from_style(&*self.style, &font_metrics) } /// Returns the sum of the inline-sizes of all the borders of this fragment. Note that this /// can be expensive to compute, so if possible use the `border_padding` field instead. #[inline] - fn border_width(&self) -> LogicalMargin<Au> { + pub fn border_width(&self) -> LogicalMargin<Au> { let style_border_width = match self.specific { SpecificFragmentInfo::ScannedText(_) | SpecificFragmentInfo::InlineBlock(_) => LogicalMargin::zero(self.style.writing_mode), @@ -1471,6 +1473,17 @@ impl Fragment { result } + /// Returns the narrowest inline-size that the first splittable part of this fragment could + /// possibly be split to. (In most cases, this returns the inline-size of the first word in + /// this fragment.) + pub fn minimum_splittable_inline_size(&self) -> Au { + match self.specific { + SpecificFragmentInfo::ScannedText(ref text) => { + text.run.minimum_splittable_inline_size(&text.range) + } + _ => Au(0), + } + } /// TODO: What exactly does this function return? Why is it Au(0) for /// `SpecificFragmentInfo::Generic`? @@ -1972,14 +1985,19 @@ impl Fragment { } SpecificFragmentInfo::InlineBlock(ref info) => { // See CSS 2.1 § 10.8.1. - let block_flow = info.flow_ref.as_block(); - let font_style = self.style.get_font_arc(); - let font_metrics = text::font_metrics_for_style(&mut layout_context.font_context(), - font_style); - InlineMetrics::from_block_height(&font_metrics, - block_flow.base.position.size.block, - block_flow.fragment.margin.block_start, - block_flow.fragment.margin.block_end) + let flow = &info.flow_ref; + let block_flow = flow.as_block(); + let baseline_offset = match flow.baseline_offset_of_last_line_box_in_flow() { + Some(baseline_offset) => baseline_offset, + None => block_flow.fragment.border_box.size.block, + }; + let start_margin = block_flow.fragment.margin.block_start; + let end_margin = block_flow.fragment.margin.block_end; + let depth_below_baseline = flow::base(&**flow).position.size.block - + baseline_offset + end_margin; + InlineMetrics::new(baseline_offset + start_margin, + depth_below_baseline, + baseline_offset) } SpecificFragmentInfo::InlineAbsoluteHypothetical(_) | SpecificFragmentInfo::InlineAbsolute(_) => { @@ -2385,16 +2403,11 @@ impl Fragment { let whitespace_len = scanned_text_fragment_info.range.length() - whitespace_start; let whitespace_range = Range::new(whitespace_start, whitespace_len); - // FIXME: This may be unnecessary because these metrics will be recomputed in - // LineBreaker::strip_trailing_whitespace_from_pending_line_if_necessary let text_bounds = scanned_text_fragment_info.run .metrics_for_range(&whitespace_range) .bounding_box; - self.border_box.size.inline = self.border_box.size.inline - - text_bounds.size.width; - - scanned_text_fragment_info.content_size.inline = - scanned_text_fragment_info.content_size.inline - text_bounds.size.width; + self.border_box.size.inline -= text_bounds.size.width; + scanned_text_fragment_info.content_size.inline -= text_bounds.size.width; scanned_text_fragment_info.range.extend_by(-whitespace_len); WhitespaceStrippingResult::RetainFragment @@ -2541,6 +2554,46 @@ impl Fragment { pub fn layer_id_for_overflow_scroll(&self) -> LayerId { LayerId::new_of_type(LayerType::OverflowScroll, self.node.id() as usize) } + + /// Returns true if any of the inline styles associated with this fragment have + /// `vertical-align` set to `top` or `bottom`. + pub fn is_vertically_aligned_to_top_or_bottom(&self) -> bool { + match self.style.get_box().vertical_align { + vertical_align::T::top | vertical_align::T::bottom => return true, + _ => {} + } + if let Some(ref inline_context) = self.inline_context { + for node in &inline_context.nodes { + match node.style.get_box().vertical_align { + vertical_align::T::top | vertical_align::T::bottom => return true, + _ => {} + } + } + } + false + } + + pub fn is_text_or_replaced(&self) -> bool { + match self.specific { + SpecificFragmentInfo::Generic | + SpecificFragmentInfo::InlineAbsolute(_) | + SpecificFragmentInfo::InlineAbsoluteHypothetical(_) | + SpecificFragmentInfo::InlineBlock(_) | + SpecificFragmentInfo::Multicol | + SpecificFragmentInfo::MulticolColumn | + SpecificFragmentInfo::Table | + SpecificFragmentInfo::TableCell | + SpecificFragmentInfo::TableColumn(_) | + SpecificFragmentInfo::TableRow | + SpecificFragmentInfo::TableWrapper => false, + SpecificFragmentInfo::Canvas(_) | + SpecificFragmentInfo::GeneratedContent(_) | + SpecificFragmentInfo::Iframe(_) | + SpecificFragmentInfo::Image(_) | + SpecificFragmentInfo::ScannedText(_) | + SpecificFragmentInfo::UnscannedText(_) => true + } + } } impl fmt::Debug for Fragment { diff --git a/components/layout/incremental.rs b/components/layout/incremental.rs index a743afd1555..9670028cfa3 100644 --- a/components/layout/incremental.rs +++ b/components/layout/incremental.rs @@ -211,7 +211,7 @@ pub fn compute_damage(old: Option<&Arc<ServoComputedValues>>, new: &ServoCompute get_margin.margin_bottom, get_margin.margin_left, get_padding.padding_top, get_padding.padding_right, get_padding.padding_bottom, get_padding.padding_left, - get_box.width, get_box.height, + get_position.width, get_position.height, get_inheritedtext.line_height, get_inheritedtext.text_align, get_inheritedtext.text_indent, get_table.table_layout, @@ -274,13 +274,15 @@ impl<'a> LayoutDamageComputation for &'a mut Flow { { let self_base = flow::mut_base(self); + // Take a snapshot of the parent damage before updating it with damage from children. + let parent_damage = self_base.restyle_damage; + for kid in self_base.children.iter_mut() { let child_is_absolutely_positioned = flow::base(kid).flags.contains(IS_ABSOLUTELY_POSITIONED); - flow::mut_base(kid).restyle_damage - .insert(self_base.restyle_damage.damage_for_child( - is_absolutely_positioned, - child_is_absolutely_positioned)); + flow::mut_base(kid).restyle_damage.insert( + parent_damage.damage_for_child(is_absolutely_positioned, + child_is_absolutely_positioned)); { let kid: &mut Flow = kid; special_damage.insert(kid.compute_layout_damage()); diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 95c3c85454a..aa04771093a 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -11,7 +11,8 @@ use display_list_builder::DisplayListBuildState; use display_list_builder::{FragmentDisplayListBuilding, InlineFlowDisplayListBuilding}; use euclid::{Point2D, Size2D}; use floats::{FloatKind, Floats, PlacementInfo}; -use flow::{EarlyAbsolutePositionInfo, MutableFlowUtils, OpaqueFlow}; +use flow::{CONTAINS_TEXT_OR_REPLACED_FRAGMENTS, EarlyAbsolutePositionInfo, MutableFlowUtils}; +use flow::{OpaqueFlow}; use flow::{self, BaseFlow, Flow, FlowClass, ForceNonfloatedFlag, IS_ABSOLUTELY_POSITIONED}; use flow_ref; use fragment::{CoordinateSystem, Fragment, FragmentBorderBoxIterator, Overflow}; @@ -26,7 +27,7 @@ use range::{Range, RangeIndex}; use std::cmp::max; use std::collections::VecDeque; use std::sync::Arc; -use std::{fmt, isize, mem}; +use std::{fmt, i32, isize, mem}; use style::computed_values::{display, overflow_x, position, text_align, text_justify}; use style::computed_values::{text_overflow, vertical_align, white_space}; use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; @@ -391,40 +392,35 @@ impl LineBreaker { let last_fragment_index = self.pending_line.range.end() - FragmentIndex(1); let mut fragment = &mut self.new_fragments[last_fragment_index.get() as usize]; - let mut old_fragment_inline_size = None; - if let SpecificFragmentInfo::ScannedText(_) = fragment.specific { - old_fragment_inline_size = Some(fragment.border_box.size.inline + - fragment.margin.inline_start_end()); - } + let old_fragment_inline_size = fragment.border_box.size.inline; fragment.strip_trailing_whitespace_if_necessary(); - if let SpecificFragmentInfo::ScannedText(ref mut scanned_text_fragment_info) = - fragment.specific { - let scanned_text_fragment_info = &mut **scanned_text_fragment_info; - let range = &mut scanned_text_fragment_info.range; - - scanned_text_fragment_info.content_size.inline = - scanned_text_fragment_info.run.metrics_for_range(range).advance_width; - fragment.border_box.size.inline = scanned_text_fragment_info.content_size.inline + - fragment.border_padding.inline_start_end(); - self.pending_line.bounds.size.inline = self.pending_line.bounds.size.inline - - (old_fragment_inline_size.unwrap() - - (fragment.border_box.size.inline + fragment.margin.inline_start_end())); - } + self.pending_line.bounds.size.inline += + fragment.border_box.size.inline - old_fragment_inline_size; } // FIXME(eatkinson): this assumes that the tallest fragment in the line determines the line // block-size. This might not be the case with some weird text fonts. fn new_inline_metrics_for_line(&self, new_fragment: &Fragment, layout_context: &LayoutContext) -> InlineMetrics { - self.pending_line.inline_metrics.max(&new_fragment.inline_metrics(layout_context)) + if !new_fragment.is_vertically_aligned_to_top_or_bottom() { + let fragment_inline_metrics = new_fragment.inline_metrics(layout_context); + self.pending_line.inline_metrics.max(&fragment_inline_metrics) + } else { + self.pending_line.inline_metrics + } } fn new_block_size_for_line(&self, new_fragment: &Fragment, layout_context: &LayoutContext) -> Au { - max(self.pending_line.bounds.size.block, - self.new_inline_metrics_for_line(new_fragment, layout_context).block_size()) + let new_block_size = if new_fragment.is_vertically_aligned_to_top_or_bottom() { + max(new_fragment.inline_metrics(layout_context).block_size(), + self.minimum_block_size_above_baseline + self.minimum_depth_below_baseline) + } else { + self.new_inline_metrics_for_line(new_fragment, layout_context).block_size() + }; + max(self.pending_line.bounds.size.block, new_block_size) } /// Computes the position of a line that has only the provided fragment. Returns the bounding @@ -444,7 +440,7 @@ impl LineBreaker { // Initially, pretend a splittable fragment has zero inline-size. We will move it later if // it has nonzero inline-size and that causes problems. let placement_inline_size = if first_fragment.can_split() { - Au(0) + first_fragment.minimum_splittable_inline_size() } else { first_fragment.margin_box_inline_size() + self.indentation_for_pending_fragment() }; @@ -855,105 +851,6 @@ impl InlineFlow { flow } - /// Returns the distance from the baseline for the logical block-start inline-start corner of - /// this fragment, taking into account the value of the CSS `vertical-align` property. - /// Negative values mean "toward the logical block-start" and positive values mean "toward the - /// logical block-end". - /// - /// The extra boolean is set if and only if `largest_block_size_for_top_fragments` and/or - /// `largest_block_size_for_bottom_fragments` were updated. That is, if the box has a `top` or - /// `bottom` value for `vertical-align`, true is returned. - fn distance_from_baseline(fragment: &Fragment, - ascent: Au, - parent_text_block_start: Au, - parent_text_block_end: Au, - block_size_above_baseline: &mut Au, - depth_below_baseline: &mut Au, - largest_block_size_for_top_fragments: &mut Au, - largest_block_size_for_bottom_fragments: &mut Au, - layout_context: &LayoutContext) - -> (Au, bool) { - let (mut offset_from_baseline, mut largest_size_updated) = (Au(0), false); - for style in fragment.inline_styles() { - // Ignore `vertical-align` values for table cells. - let box_style = style.get_box(); - match box_style.display { - display::T::inline | display::T::block | display::T::inline_block => {} - _ => continue, - } - - match box_style.vertical_align { - vertical_align::T::baseline => {} - vertical_align::T::middle => { - // TODO: x-height value should be used from font info. - // TODO: Doing nothing here passes our current reftests but doesn't work in - // all situations. Add vertical align reftests and fix this. - }, - vertical_align::T::sub => { - let sub_offset = (parent_text_block_start + parent_text_block_end) - .scale_by(FONT_SUBSCRIPT_OFFSET_RATIO); - offset_from_baseline = offset_from_baseline + sub_offset - }, - vertical_align::T::super_ => { - let super_offset = (parent_text_block_start + parent_text_block_end) - .scale_by(FONT_SUPERSCRIPT_OFFSET_RATIO); - offset_from_baseline = offset_from_baseline - super_offset - }, - vertical_align::T::text_top => { - let fragment_block_size = *block_size_above_baseline + - *depth_below_baseline; - let prev_depth_below_baseline = *depth_below_baseline; - *block_size_above_baseline = parent_text_block_start; - *depth_below_baseline = fragment_block_size - *block_size_above_baseline; - offset_from_baseline = offset_from_baseline + *depth_below_baseline - - prev_depth_below_baseline - }, - vertical_align::T::text_bottom => { - let fragment_block_size = *block_size_above_baseline + - *depth_below_baseline; - let prev_depth_below_baseline = *depth_below_baseline; - *depth_below_baseline = parent_text_block_end; - *block_size_above_baseline = fragment_block_size - *depth_below_baseline; - offset_from_baseline = offset_from_baseline + *depth_below_baseline - - prev_depth_below_baseline - }, - vertical_align::T::top => { - if !largest_size_updated { - largest_size_updated = true; - *largest_block_size_for_top_fragments = - max(*largest_block_size_for_top_fragments, - *block_size_above_baseline + *depth_below_baseline); - offset_from_baseline = offset_from_baseline + - *block_size_above_baseline - } - }, - vertical_align::T::bottom => { - if !largest_size_updated { - largest_size_updated = true; - *largest_block_size_for_bottom_fragments = - max(*largest_block_size_for_bottom_fragments, - *block_size_above_baseline + *depth_below_baseline); - offset_from_baseline = offset_from_baseline - *depth_below_baseline - } - }, - vertical_align::T::LengthOrPercentage(LengthOrPercentage::Length(length)) => { - offset_from_baseline = offset_from_baseline - length - } - vertical_align::T::LengthOrPercentage(LengthOrPercentage::Percentage(p)) => { - let line_height = fragment.calculate_line_height(layout_context); - let percent_offset = line_height.scale_by(p); - offset_from_baseline = offset_from_baseline - percent_offset - } - vertical_align::T::LengthOrPercentage(LengthOrPercentage::Calc(calc)) => { - let line_height = fragment.calculate_line_height(layout_context); - let percent_offset = line_height.scale_by(calc.percentage()); - offset_from_baseline = offset_from_baseline - percent_offset - calc.length() - } - } - } - (offset_from_baseline - ascent, largest_size_updated) - } - /// Sets fragment positions in the inline direction based on alignment for one line. This /// performs text justification if mandated by the style. fn set_inline_fragment_positions(fragments: &mut InlineFragments, @@ -1119,13 +1016,12 @@ impl InlineFlow { } } - /// Sets final fragment positions in the block direction for one line. Assumes that the - /// fragment positions were initially set to the distance from the baseline first. + /// Sets final fragment positions in the block direction for one line. fn set_block_fragment_positions(fragments: &mut InlineFragments, line: &Line, - line_distance_from_flow_block_start: Au, - baseline_distance_from_block_start: Au, - largest_depth_below_baseline: Au) { + minimum_block_size_above_baseline: Au, + minimum_depth_below_baseline: Au, + layout_context: &LayoutContext) { for fragment_index in line.range.each_index() { // If any of the inline styles say `top` or `bottom`, adjust the vertical align // appropriately. @@ -1133,42 +1029,63 @@ impl InlineFlow { // FIXME(#5624, pcwalton): This passes our current reftests but isn't the right thing // to do. let fragment = fragments.get_mut(fragment_index.to_usize()); - let mut vertical_align = vertical_align::T::baseline; + let fragment_inline_metrics = fragment.inline_metrics(layout_context); + let mut block_start = line.bounds.start.b + + line.inline_metrics.block_size_above_baseline - + fragment_inline_metrics.ascent; + for style in fragment.inline_styles() { - match (style.get_box().display, style.get_box().vertical_align) { - (display::T::inline, vertical_align::T::top) | - (display::T::block, vertical_align::T::top) | - (display::T::inline_block, vertical_align::T::top) => { - vertical_align = vertical_align::T::top; - break + match style.get_box().vertical_align { + vertical_align::T::baseline => {} + vertical_align::T::middle => {} + vertical_align::T::sub => { + let sub_offset = + (minimum_block_size_above_baseline + + minimum_depth_below_baseline).scale_by(FONT_SUBSCRIPT_OFFSET_RATIO); + block_start = block_start + sub_offset } - (display::T::inline, vertical_align::T::bottom) | - (display::T::block, vertical_align::T::bottom) | - (display::T::inline_block, vertical_align::T::bottom) => { - vertical_align = vertical_align::T::bottom; - break + vertical_align::T::super_ => { + let super_offset = + (minimum_block_size_above_baseline + + minimum_depth_below_baseline).scale_by(FONT_SUPERSCRIPT_OFFSET_RATIO); + block_start = block_start - super_offset + } + vertical_align::T::text_top => { + block_start = line.bounds.start.b + + line.inline_metrics.block_size_above_baseline - + minimum_block_size_above_baseline + } + vertical_align::T::text_bottom => { + block_start = line.bounds.start.b + + line.inline_metrics.block_size_above_baseline + + minimum_depth_below_baseline - + fragment.border_box.size.block + } + vertical_align::T::top => { + block_start = line.bounds.start.b + } + vertical_align::T::bottom => { + block_start = line.bounds.start.b + line.bounds.size.block - + fragment.border_box.size.block + } + vertical_align::T::LengthOrPercentage(LengthOrPercentage::Length(length)) => { + block_start = block_start - length + } + vertical_align::T::LengthOrPercentage(LengthOrPercentage::Percentage( + percentage)) => { + let line_height = fragment.calculate_line_height(layout_context); + let length = line_height.scale_by(percentage); + block_start = block_start - length + } + vertical_align::T::LengthOrPercentage(LengthOrPercentage::Calc(calc)) => { + let line_height = fragment.calculate_line_height(layout_context); + let percentage_length = line_height.scale_by(calc.percentage()); + block_start = block_start - percentage_length - calc.length() } - _ => {} - } - } - - match vertical_align { - vertical_align::T::top => { - fragment.border_box.start.b = fragment.border_box.start.b + - line_distance_from_flow_block_start - } - vertical_align::T::bottom => { - fragment.border_box.start.b = fragment.border_box.start.b + - line_distance_from_flow_block_start + - baseline_distance_from_block_start + - largest_depth_below_baseline; - } - _ => { - fragment.border_box.start.b = fragment.border_box.start.b + - line_distance_from_flow_block_start + baseline_distance_from_block_start } } + fragment.border_box.start.b = block_start; fragment.update_late_computed_block_position_if_necessary(); } } @@ -1192,31 +1109,88 @@ impl InlineFlow { let line_height = text::line_height_from_style(style, &font_metrics); let inline_metrics = InlineMetrics::from_font_metrics(&font_metrics, line_height); - let mut block_size_above_baseline = inline_metrics.block_size_above_baseline; - let mut depth_below_baseline = inline_metrics.depth_below_baseline; + let mut block_size_above_baseline = Au(0); + let mut depth_below_baseline = Au(i32::MIN); + let mut largest_block_size_for_top_fragments = Au(0); + let mut largest_block_size_for_bottom_fragments = Au(0); + + // We use `vertical_align::T::baseline` here because `vertical-align` must not apply to + // the inside of inline blocks. + update_inline_metrics(&inline_metrics, + style.get_box().display, + vertical_align::T::baseline, + &mut block_size_above_baseline, + &mut depth_below_baseline, + &mut largest_block_size_for_top_fragments, + &mut largest_block_size_for_bottom_fragments); // According to CSS 2.1 § 10.8, `line-height` of any inline element specifies the minimal // height of line boxes within the element. for frag in &self.fragments.fragments { - match frag.inline_context { - Some(ref inline_context) => { - for node in &inline_context.nodes { - let font_style = node.style.get_font_arc(); - let font_metrics = text::font_metrics_for_style(font_context, font_style); - let line_height = text::line_height_from_style(&*node.style, &font_metrics); - let inline_metrics = InlineMetrics::from_font_metrics(&font_metrics, - line_height); - block_size_above_baseline = max(block_size_above_baseline, - inline_metrics.block_size_above_baseline); - depth_below_baseline = max(depth_below_baseline, - inline_metrics.depth_below_baseline); - } + if let Some(ref inline_context) = frag.inline_context { + for node in &inline_context.nodes { + let font_style = node.style.get_font_arc(); + let font_metrics = text::font_metrics_for_style(font_context, font_style); + let line_height = text::line_height_from_style(&*node.style, &font_metrics); + let inline_metrics = InlineMetrics::from_font_metrics(&font_metrics, + line_height); + + update_inline_metrics(&inline_metrics, + node.style.get_box().display, + node.style.get_box().vertical_align, + &mut block_size_above_baseline, + &mut depth_below_baseline, + &mut largest_block_size_for_top_fragments, + &mut largest_block_size_for_bottom_fragments); + } - None => {} } } - (block_size_above_baseline, depth_below_baseline) + block_size_above_baseline = + max(block_size_above_baseline, + largest_block_size_for_bottom_fragments - max(depth_below_baseline, Au(0))); + depth_below_baseline = + max(depth_below_baseline, + largest_block_size_for_top_fragments - block_size_above_baseline); + + return (block_size_above_baseline, depth_below_baseline); + + fn update_inline_metrics(inline_metrics: &InlineMetrics, + display_value: display::T, + vertical_align_value: vertical_align::T, + block_size_above_baseline: &mut Au, + depth_below_baseline: &mut Au, + largest_block_size_for_top_fragments: &mut Au, + largest_block_size_for_bottom_fragments: &mut Au) { + match (display_value, vertical_align_value) { + (display::T::inline, vertical_align::T::top) | + (display::T::block, vertical_align::T::top) | + (display::T::inline_block, vertical_align::T::top) if + inline_metrics.block_size_above_baseline >= Au(0) => { + *largest_block_size_for_top_fragments = + max(*largest_block_size_for_top_fragments, + inline_metrics.block_size_above_baseline + + inline_metrics.depth_below_baseline) + } + (display::T::inline, vertical_align::T::bottom) | + (display::T::block, vertical_align::T::bottom) | + (display::T::inline_block, vertical_align::T::bottom) if + inline_metrics.depth_below_baseline >= Au(0) => { + *largest_block_size_for_bottom_fragments = + max(*largest_block_size_for_bottom_fragments, + inline_metrics.block_size_above_baseline + + inline_metrics.depth_below_baseline) + } + _ => { + *block_size_above_baseline = + max(*block_size_above_baseline, + inline_metrics.block_size_above_baseline); + *depth_below_baseline = max(*depth_below_baseline, + inline_metrics.depth_below_baseline); + } + } + } } fn update_restyle_damage(&mut self) { @@ -1275,6 +1249,16 @@ impl InlineFlow { } } } + + pub fn baseline_offset_of_last_line(&self) -> Option<Au> { + match self.lines.last() { + None => None, + Some(ref last_line) => { + Some(last_line.bounds.start.b + last_line.bounds.size.block - + last_line.inline_metrics.depth_below_baseline) + } + } + } } impl Flow for InlineFlow { @@ -1300,6 +1284,8 @@ impl Flow for InlineFlow { flow::mut_base(kid).floats = Floats::new(writing_mode); } + self.base.flags.remove(CONTAINS_TEXT_OR_REPLACED_FRAGMENTS); + let mut intrinsic_sizes_for_flow = IntrinsicISizesContribution::new(); let mut intrinsic_sizes_for_inline_run = IntrinsicISizesContribution::new(); let mut intrinsic_sizes_for_nonbroken_run = IntrinsicISizesContribution::new(); @@ -1358,6 +1344,10 @@ impl Flow for InlineFlow { } fragment.restyle_damage.remove(BUBBLE_ISIZES); + + if fragment.is_text_or_replaced() { + self.base.flags.insert(CONTAINS_TEXT_OR_REPLACED_FRAGMENTS); + } } // Flush any remaining nonbroken-run and inline-run intrinsic sizes. @@ -1451,11 +1441,8 @@ impl Flow for InlineFlow { // Now, go through each line and lay out the fragments inside. - let mut line_distance_from_flow_block_start = Au(0); let line_count = self.lines.len(); - for line_index in 0..line_count { - let line = &mut self.lines[line_index]; - + for (line_index, line) in self.lines.iter_mut().enumerate() { // Lay out fragments in the inline direction, and justify them if necessary. InlineFlow::set_inline_fragment_positions(&mut self.fragments, line, @@ -1463,108 +1450,17 @@ impl Flow for InlineFlow { indentation, line_index + 1 == line_count); - // Set the block-start position of the current line. - // `line_height_offset` is updated at the end of the previous loop. - line.bounds.start.b = line_distance_from_flow_block_start; - - // Calculate the distance from the baseline to the block-start and block-end of the - // line. - let mut largest_block_size_above_baseline = self.minimum_block_size_above_baseline; - let mut largest_depth_below_baseline = self.minimum_depth_below_baseline; - - // Calculate the largest block-size among fragments with 'top' and 'bottom' values - // respectively. - let (mut largest_block_size_for_top_fragments, - mut largest_block_size_for_bottom_fragments) = (Au(0), Au(0)); - - for fragment_index in line.range.each_index() { - let fragment = &mut self.fragments.fragments[fragment_index.to_usize()]; - - let InlineMetrics { - mut block_size_above_baseline, - mut depth_below_baseline, - ascent - } = fragment.inline_metrics(layout_context); - - // To calculate text-top and text-bottom value when `vertical-align` is involved, - // we should find the top and bottom of the content area of the parent fragment. - // "Content area" is defined in CSS 2.1 § 10.6.1. - // - // TODO: We should extract em-box info from the font size of the parent and - // calculate the distances from the baseline to the block-start and the block-end - // of the parent's content area. - - // We should calculate the distance from baseline to the top of parent's content - // area. But for now we assume it's the font size. - // - // CSS 2.1 does not state which font to use. This version of the code uses - // the parent's font. - - // Calculate the final block-size above the baseline for this fragment. - // - // The no-update flag decides whether `largest_block_size_for_top_fragments` and - // `largest_block_size_for_bottom_fragments` are to be updated or not. This will be - // set if and only if the fragment has `vertical-align` set to `top` or `bottom`. - let (distance_from_baseline, no_update_flag) = - InlineFlow::distance_from_baseline( - fragment, - ascent, - self.minimum_block_size_above_baseline, - self.minimum_depth_below_baseline, - &mut block_size_above_baseline, - &mut depth_below_baseline, - &mut largest_block_size_for_top_fragments, - &mut largest_block_size_for_bottom_fragments, - layout_context); - - // Unless the current fragment has `vertical-align` set to `top` or `bottom`, - // `largest_block_size_above_baseline` and `largest_depth_below_baseline` are - // updated. - if !no_update_flag { - largest_block_size_above_baseline = max(block_size_above_baseline, - largest_block_size_above_baseline); - largest_depth_below_baseline = max(depth_below_baseline, - largest_depth_below_baseline); - } - - // Temporarily use `fragment.border_box.start.b` to mean "the distance from the - // baseline". We will assign the real value later. - fragment.border_box.start.b = distance_from_baseline - } - - // Calculate the distance from the baseline to the top of the largest fragment with a - // value for `bottom`. Then, if necessary, update `largest_block-size_above_baseline`. - largest_block_size_above_baseline = - max(largest_block_size_above_baseline, - largest_block_size_for_bottom_fragments - largest_depth_below_baseline); - - // Calculate the distance from baseline to the bottom of the largest fragment with a - // value for `top`. Then, if necessary, update `largest_depth_below_baseline`. - largest_depth_below_baseline = - max(largest_depth_below_baseline, - largest_block_size_for_top_fragments - largest_block_size_above_baseline); - - // Now, the distance from the logical block-start of the line to the baseline can be - // computed as `largest_block-size_above_baseline`. - let baseline_distance_from_block_start = largest_block_size_above_baseline; - - // Compute the final positions in the block direction of each fragment. Recall that - // `fragment.border_box.start.b` was set to the distance from the baseline above. + // Compute the final positions in the block direction of each fragment. InlineFlow::set_block_fragment_positions(&mut self.fragments, line, - line_distance_from_flow_block_start, - baseline_distance_from_block_start, - largest_depth_below_baseline); + self.minimum_block_size_above_baseline, + self.minimum_depth_below_baseline, + layout_context); - // This is used to set the block-start position of the next line in the next loop. - line.bounds.size.block = largest_block_size_above_baseline + - largest_depth_below_baseline; - line_distance_from_flow_block_start = line_distance_from_flow_block_start + - line.bounds.size.block; - - // We're no longer on the first line, so set indentation to zero. + // This is used to set the block-start position of the next line in the next iteration + // of the loop. We're no longer on the first line, so set indentation to zero. indentation = Au(0) - } // End of `lines.iter_mut()` loop. + } // Assign block sizes for any inline-block descendants. let thread_id = self.base.thread_id; @@ -1951,22 +1847,6 @@ impl InlineMetrics { } } - /// Calculates inline metrics from font metrics and line block-size per CSS 2.1 § 10.8.1. - #[inline] - pub fn from_block_height(font_metrics: &FontMetrics, - block_height: Au, - block_start_margin: Au, - block_end_margin: Au) - -> InlineMetrics { - let leading = block_height + block_start_margin + block_end_margin - - (font_metrics.ascent + font_metrics.descent); - InlineMetrics { - block_size_above_baseline: font_metrics.ascent + leading.scale_by(0.5), - depth_below_baseline: font_metrics.descent + leading.scale_by(0.5), - ascent: font_metrics.ascent + leading.scale_by(0.5) - block_start_margin, - } - } - pub fn block_size(&self) -> Au { self.block_size_above_baseline + self.depth_below_baseline } diff --git a/components/net/bluetooth_thread.rs b/components/net/bluetooth_thread.rs index 14bb72f2bcf..c8a6e4af31e 100644 --- a/components/net/bluetooth_thread.rs +++ b/components/net/bluetooth_thread.rs @@ -368,11 +368,6 @@ impl BluetoothManager { let message = Ok(BluetoothDeviceMsg { id: address, name: device.get_name().ok(), - device_class: device.get_class().ok(), - vendor_id_source: device.get_vendor_id_source().ok(), - vendor_id: device.get_vendor_id().ok(), - product_id: device.get_product_id().ok(), - product_version: device.get_device_id().ok(), appearance: device.get_appearance().ok(), tx_power: device.get_tx_power().ok().map(|p| p as i8), rssi: device.get_rssi().ok().map(|p| p as i8), diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index 7f6eee9d62a..6e96f1a8864 100644 --- a/components/net/http_loader.rs +++ b/components/net/http_loader.rs @@ -768,18 +768,18 @@ pub fn obtain_response<A>(request_factory: &HttpRequestFactory<R=A>, } pub trait UIProvider { - fn input_username_and_password(&self) -> (Option<String>, Option<String>); + fn input_username_and_password(&self, prompt: &str) -> (Option<String>, Option<String>); } impl UIProvider for TFDProvider { #[cfg(any(target_os = "macos", target_os = "linux"))] - fn input_username_and_password(&self) -> (Option<String>, Option<String>) { - (tinyfiledialogs::input_box("Enter username", "Username:", ""), - tinyfiledialogs::input_box("Enter password", "Password:", "")) + fn input_username_and_password(&self, prompt: &str) -> (Option<String>, Option<String>) { + (tinyfiledialogs::input_box(prompt, "Username:", ""), + tinyfiledialogs::input_box(prompt, "Password:", "")) } #[cfg(not(any(target_os = "macos", target_os = "linux")))] - fn input_username_and_password(&self) -> (Option<String>, Option<String>) { + fn input_username_and_password(&self, _prompt: &str) -> (Option<String>, Option<String>) { (None, None) } } @@ -870,8 +870,10 @@ pub fn load<A, B>(load_data: &LoadData, process_response_headers(&response, &doc_url, &http_state.cookie_jar, &http_state.hsts_list, &load_data); //if response status is unauthorized then prompt user for username and password - if response.status() == StatusCode::Unauthorized { - let (username_option, password_option) = ui_provider.input_username_and_password(); + if response.status() == StatusCode::Unauthorized && + response.headers().get_raw("WWW-Authenticate").is_some() { + let (username_option, password_option) = + ui_provider.input_username_and_password(doc_url.as_str()); match username_option { Some(name) => { diff --git a/components/net_traits/bluetooth_thread.rs b/components/net_traits/bluetooth_thread.rs index 34019528a1e..9a2e6f07e93 100644 --- a/components/net_traits/bluetooth_thread.rs +++ b/components/net_traits/bluetooth_thread.rs @@ -9,11 +9,6 @@ pub struct BluetoothDeviceMsg { // Bluetooth Device properties pub id: String, pub name: Option<String>, - pub device_class: Option<u32>, - pub vendor_id_source: Option<String>, - pub vendor_id: Option<u32>, - pub product_id: Option<u32>, - pub product_version: Option<u32>, // Advertisiong Data properties pub appearance: Option<u16>, pub tx_power: Option<i8>, diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 1e3326ae356..6f9fc934c3c 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -54,7 +54,7 @@ rand = "0.3" phf = "0.7.13" phf_macros = "0.7.13" ref_filter_map = "1.0" -ref_slice = "0.1.0" +ref_slice = "1.0" regex = "0.1.43" rustc-serialize = "0.3" selectors = {version = "0.5", features = ["heap_size"]} diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs index 1e1ae3b147d..94e4ac5b146 100644 --- a/components/script/dom/bluetooth.rs +++ b/components/script/dom/bluetooth.rs @@ -6,7 +6,6 @@ use core::clone::Clone; use dom::bindings::codegen::Bindings::BluetoothBinding; use dom::bindings::codegen::Bindings::BluetoothBinding::RequestDeviceOptions; use dom::bindings::codegen::Bindings::BluetoothBinding::{BluetoothScanFilter, BluetoothMethods}; -use dom::bindings::codegen::Bindings::BluetoothDeviceBinding::VendorIDSource; use dom::bindings::error::Error::Type; use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; @@ -142,20 +141,10 @@ impl BluetoothMethods for Bluetooth { device.appearance, device.tx_power, device.rssi); - let vendor_id_source = device.vendor_id_source.map(|vid| match vid.as_str() { - "bluetooth" => VendorIDSource::Bluetooth, - "usb" => VendorIDSource::Usb, - _ => VendorIDSource::Unknown, - }); Ok(BluetoothDevice::new(self.global().r(), DOMString::from(device.id), device.name.map(DOMString::from), - &ad_data, - device.device_class, - vendor_id_source, - device.vendor_id, - device.product_id, - device.product_version)) + &ad_data)) }, Err(error) => { Err(Type(error)) diff --git a/components/script/dom/bluetoothdevice.rs b/components/script/dom/bluetoothdevice.rs index 8330ca4604a..9d26905261e 100644 --- a/components/script/dom/bluetoothdevice.rs +++ b/components/script/dom/bluetoothdevice.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::Bindings::BluetoothDeviceBinding; -use dom::bindings::codegen::Bindings::BluetoothDeviceBinding::{BluetoothDeviceMethods, VendorIDSource}; +use dom::bindings::codegen::Bindings::BluetoothDeviceBinding::BluetoothDeviceMethods; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, Root, MutHeap, MutNullableHeap}; use dom::bindings::reflector::{Reflectable, Reflector, reflect_dom_object}; @@ -18,34 +18,19 @@ pub struct BluetoothDevice { id: DOMString, name: Option<DOMString>, adData: MutHeap<JS<BluetoothAdvertisingData>>, - deviceClass: Option<u32>, - vendorIDSource: Option<VendorIDSource>, - vendorID: Option<u32>, - productID: Option<u32>, - productVersion: Option<u32>, gatt: MutNullableHeap<JS<BluetoothRemoteGATTServer>>, } impl BluetoothDevice { pub fn new_inherited(id: DOMString, name: Option<DOMString>, - adData: &BluetoothAdvertisingData, - deviceClass: Option<u32>, - vendorIDSource: Option<VendorIDSource>, - vendorID: Option<u32>, - productID: Option<u32>, - productVersion: Option<u32>) + adData: &BluetoothAdvertisingData) -> BluetoothDevice { BluetoothDevice { reflector_: Reflector::new(), id: id, name: name, adData: MutHeap::new(adData), - deviceClass: deviceClass, - vendorIDSource: vendorIDSource, - vendorID: vendorID, - productID: productID, - productVersion: productVersion, gatt: Default::default(), } } @@ -53,21 +38,11 @@ impl BluetoothDevice { pub fn new(global: GlobalRef, id: DOMString, name: Option<DOMString>, - adData: &BluetoothAdvertisingData, - deviceClass: Option<u32>, - vendorIDSource: Option<VendorIDSource>, - vendorID: Option<u32>, - productID: Option<u32>, - productVersion: Option<u32>) + adData: &BluetoothAdvertisingData) -> Root<BluetoothDevice> { reflect_dom_object(box BluetoothDevice::new_inherited(id, name, - adData, - deviceClass, - vendorIDSource, - vendorID, - productID, - productVersion), + adData), global, BluetoothDeviceBinding::Wrap) } @@ -90,31 +65,6 @@ impl BluetoothDeviceMethods for BluetoothDevice { self.adData.get() } - // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-deviceclass - fn GetDeviceClass(&self) -> Option<u32> { - self.deviceClass - } - - // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-vendoridsource - fn GetVendorIDSource(&self) -> Option<VendorIDSource> { - self.vendorIDSource - } - - // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-vendorid - fn GetVendorID(&self) -> Option<u32> { - self.vendorID - } - - // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-productid - fn GetProductID(&self) -> Option<u32> { - self.productID - } - - // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-productversion - fn GetProductVersion(&self) -> Option<u32> { - self.productVersion - } - // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-gatt fn Gatt(&self) -> Root<BluetoothRemoteGATTServer> { self.gatt.or_init(|| BluetoothRemoteGATTServer::new(self.global().r(), self)) diff --git a/components/script/dom/css.rs b/components/script/dom/css.rs index e1d2917084e..d53a94e5da2 100644 --- a/components/script/dom/css.rs +++ b/components/script/dom/css.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use cssparser::serialize_identifier; -use dom::bindings::error::{Error, Fallible}; +use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; use dom::bindings::reflector::Reflector; use util::str::DOMString; @@ -16,9 +16,6 @@ pub struct CSS { impl CSS { // http://dev.w3.org/csswg/cssom/#serialize-an-identifier pub fn Escape(_: GlobalRef, ident: DOMString) -> Fallible<DOMString> { - if ident.bytes().any(|b| b == b'\0') { - return Err(Error::InvalidCharacter); - } let mut escaped = String::new(); serialize_identifier(&ident, &mut escaped).unwrap(); Ok(DOMString::from(escaped)) diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index d422e9bd278..93cb656dcdb 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -624,10 +624,12 @@ impl Document { /// Handles any updates when the document's title has changed. pub fn title_changed(&self) { - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowsertitlechange - self.trigger_mozbrowser_event(MozBrowserEvent::TitleChange(String::from(self.Title()))); + if self.browsing_context().is_some() { + // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowsertitlechange + self.trigger_mozbrowser_event(MozBrowserEvent::TitleChange(String::from(self.Title()))); - self.send_title_to_compositor(); + self.send_title_to_compositor(); + } } /// Sends this document's title to the compositor. diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 0e8b6174ab5..a1fdd34e82a 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -736,8 +736,8 @@ impl<'a> FormSubmitter<'a> { }, FormSubmitter::ButtonElement(button_element) => { button_element.get_form_attribute(&atom!("formenctype"), - |i| i.FormAction(), - |f| f.Action()) + |i| i.FormEnctype(), + |f| f.Enctype()) } }; match &*attr { @@ -759,8 +759,8 @@ impl<'a> FormSubmitter<'a> { }, FormSubmitter::ButtonElement(button_element) => { button_element.get_form_attribute(&atom!("formmethod"), - |i| i.FormAction(), - |f| f.Action()) + |i| i.FormMethod(), + |f| f.Method()) } }; match &*attr { @@ -780,8 +780,8 @@ impl<'a> FormSubmitter<'a> { }, FormSubmitter::ButtonElement(button_element) => { button_element.get_form_attribute(&atom!("formtarget"), - |i| i.FormAction(), - |f| f.Action()) + |i| i.FormTarget(), + |f| f.Target()) } } } diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 7e48ba60d34..36a8a4bb3b2 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -472,6 +472,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { WebGLParameter::Bool(_) => panic!("Buffer parameter should not be bool"), WebGLParameter::Float(_) => panic!("Buffer parameter should not be float"), WebGLParameter::String(_) => panic!("Buffer parameter should not be string"), + WebGLParameter::FloatArray(_) => panic!("Buffer parameter should not be float array"), WebGLParameter::Invalid => NullValue(), } } @@ -487,6 +488,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { WebGLParameter::Int(val) => Int32Value(val), WebGLParameter::Bool(val) => BooleanValue(val), WebGLParameter::Float(val) => DoubleValue(val as f64), + WebGLParameter::FloatArray(_) => panic!("Parameter should not be float array"), WebGLParameter::String(val) => { let mut rval = RootedValue::new(cx, UndefinedValue()); unsafe { @@ -1093,6 +1095,9 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { WebGLParameter::Bool(val) => BooleanValue(val), WebGLParameter::String(_) => panic!("Program parameter should not be string"), WebGLParameter::Float(_) => panic!("Program parameter should not be float"), + WebGLParameter::FloatArray(_) => { + panic!("Program paramenter should not be float array") + } WebGLParameter::Invalid => NullValue(), } } else { @@ -1113,6 +1118,9 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { WebGLParameter::Bool(val) => BooleanValue(val), WebGLParameter::String(_) => panic!("Shader parameter should not be string"), WebGLParameter::Float(_) => panic!("Shader parameter should not be float"), + WebGLParameter::FloatArray(_) => { + panic!("Shader paramenter should not be float array") + } WebGLParameter::Invalid => NullValue(), } } else { diff --git a/components/script/dom/webidls/BluetoothDevice.webidl b/components/script/dom/webidls/BluetoothDevice.webidl index e8851e6240c..65bfb9c1a4e 100644 --- a/components/script/dom/webidls/BluetoothDevice.webidl +++ b/components/script/dom/webidls/BluetoothDevice.webidl @@ -4,23 +4,11 @@ // https://webbluetoothcg.github.io/web-bluetooth/#bluetoothdevice -// Allocation authorities for Vendor IDs: -enum VendorIDSource { - "bluetooth", - "usb", - "unknown" -}; - [Pref="dom.bluetooth.enabled"] interface BluetoothDevice { readonly attribute DOMString id; readonly attribute DOMString? name; readonly attribute BluetoothAdvertisingData adData; - readonly attribute unsigned long? deviceClass; - readonly attribute VendorIDSource? vendorIDSource; - readonly attribute unsigned long? vendorID; - readonly attribute unsigned long? productID; - readonly attribute unsigned long? productVersion; readonly attribute BluetoothRemoteGATTServer gatt; // readonly attribute FrozenArray[] uuids; }; diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 475d5f11c25..abd2ac04db4 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -3,7 +3,7 @@ name = "servo" version = "0.0.1" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "browserhtml 0.1.4 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)", + "browserhtml 0.1.5 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)", "canvas 0.0.1", "canvas_traits 0.0.1", "compiletest_helper 0.0.1", @@ -15,14 +15,14 @@ dependencies = [ "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gfx_tests 0.0.1", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", - "image 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "layout 0.0.1", "layout_tests 0.0.1", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", @@ -38,7 +38,7 @@ dependencies = [ "script_traits 0.0.1", "style 0.0.1", "style_tests 0.0.1", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "util_tests 0.0.1", "webdriver_server 0.0.1", @@ -48,10 +48,10 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -64,20 +64,20 @@ name = "angle" version = "0.1.0" source = "git+https://github.com/emilio/angle?branch=servo#eefe3506ae13e8ace811ca544fd6b4a5f0db0a04" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "app_units" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -91,24 +91,24 @@ dependencies = [ [[package]] name = "aster" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "azure" -version = "0.4.3" -source = "git+https://github.com/servo/rust-azure#bb2fab861ff63fcc185e5dd7557a021c01e0981d" +version = "0.4.4" +source = "git+https://github.com/servo/rust-azure#7b0164d1d79957b2a59e9e103c02a53761c74b9d" dependencies = [ - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "servo-skia 0.20130412.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -120,20 +120,21 @@ name = "backtrace" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "backtrace-sys" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -144,7 +145,7 @@ dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -154,11 +155,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bitflags" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "bitflags" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -169,22 +165,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "blurz" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "dbus 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "dbus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "brotli" -version = "0.3.20" -source = "git+https://github.com/ende76/brotli-rs#c243045b88b2d2924c35269586fa9b770184c74c" +version = "0.3.23" +source = "git+https://github.com/ende76/brotli-rs#d8507fd07e9fa57ed8251d5dc500dcd62df62c7c" [[package]] name = "browserhtml" -version = "0.1.4" -source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#0ca50842ba2769a05f2f00f1fd3bfaed4baf03ab" +version = "0.1.5" +source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#146e7909211792ac6d955d87339c547aeb517136" [[package]] name = "byteorder" @@ -195,15 +191,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "canvas" version = "0.0.1" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -213,16 +209,16 @@ dependencies = [ name = "canvas_traits" version = "0.0.1" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "plugins 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -245,17 +241,17 @@ name = "cgl" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "clipboard" version = "0.1.2" -source = "git+https://github.com/aweinstock314/rust-clipboard#4fe9892d7bf8bac075aa60493c6eee7a83e24b7f" +source = "git+https://github.com/aweinstock314/rust-clipboard#f4c5c1d3c1759f0a167091405d11af1f9584fb1f" dependencies = [ "clipboard-win 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "objc-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -276,7 +272,7 @@ name = "cmake" version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -286,8 +282,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -314,8 +310,8 @@ dependencies = [ name = "compositing" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "canvas 0.0.1", "canvas_traits 0.0.1", "clipboard 0.1.2 (git+https://github.com/aweinstock314/rust-clipboard)", @@ -324,8 +320,8 @@ dependencies = [ "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gfx_traits 0.0.1", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "layout_traits 0.0.1", @@ -333,16 +329,16 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender 0.1.0 (git+https://github.com/servo/webrender)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -353,27 +349,27 @@ name = "cookie" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-foundation" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-foundation-sys" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -381,9 +377,9 @@ name = "core-graphics" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -391,27 +387,27 @@ name = "core-text" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam" -version = "0.1.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -425,10 +421,10 @@ dependencies = [ [[package]] name = "dbus" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -451,9 +447,9 @@ dependencies = [ [[package]] name = "device" version = "0.0.1" -source = "git+https://github.com/servo/devices#eeac5abfd548b63dcc48873261609922351551e1" +source = "git+https://github.com/servo/devices#cac0952154f65b416acef273a6d1099421ce113e" dependencies = [ - "blurz 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "blurz 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -461,14 +457,14 @@ name = "devtools" version = "0.0.1" dependencies = [ "devtools_traits 0.0.1", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "msg 0.0.1", "plugins 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -479,13 +475,13 @@ dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "msg 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -510,7 +506,7 @@ name = "dylib" version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -582,7 +578,7 @@ source = "git+https://github.com/energymon/energymon-rust.git#7b30c4d88ac1fcfaf7 dependencies = [ "energy-monitor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "energymon-default-sys 0.2.0 (git+https://github.com/energymon/energymon-sys.git)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -600,7 +596,7 @@ source = "git+https://github.com/energymon/energymon-sys.git#a0fb99b0312372958b1 dependencies = [ "energymon-builder 0.2.0 (git+https://github.com/energymon/energymon-sys.git)", "energymon-sys 0.2.0 (git+https://github.com/energymon/energymon-sys.git)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -608,7 +604,7 @@ name = "energymon-sys" version = "0.2.0" source = "git+https://github.com/energymon/energymon-sys.git#a0fb99b0312372958b110ae6378b5c89c2287172" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -638,8 +634,8 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -653,10 +649,10 @@ dependencies = [ [[package]] name = "flate2" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -670,16 +666,16 @@ name = "freetype" version = "0.1.0" source = "git+https://github.com/servo/rust-freetype#d564ff90a3c69d987f5c015d7ec034cfaee21aff" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "fs2" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -695,16 +691,16 @@ dependencies = [ [[package]] name = "gaol" version = "0.0.1" -source = "git+https://github.com/servo/gaol#cbb2518029901f078f871a87ebe05cf96d727713" +source = "git+https://github.com/servo/gaol#545c703ebfe7a3a0d7129eb40981527f5d680860" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gcc" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -724,23 +720,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "gfx" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "gfx_traits 0.0.1", - "harfbuzz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "harfbuzz-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -750,18 +746,18 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-skia 0.20130412.6 (registry+https://github.com/rust-lang/crates.io-index)", "simd 0.1.0 (git+https://github.com/huonw/simd)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -780,15 +776,15 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "msg 0.0.1", "plugins 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -807,12 +803,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gleam" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -830,7 +826,7 @@ dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "msg 0.0.1", "net_traits 0.0.1", @@ -838,7 +834,7 @@ dependencies = [ "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-glutin 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -850,15 +846,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "harfbuzz-sys" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -876,7 +872,7 @@ name = "hbs-common-sys" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -885,7 +881,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hbs-pow-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -895,7 +891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hbs-builder 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "hbs-common-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -921,46 +917,46 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "tendril 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "tendril 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "httparse" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hyper" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "httparse 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "language-tags 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -975,7 +971,7 @@ dependencies = [ [[package]] name = "image" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -983,8 +979,10 @@ dependencies = [ "gif 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "jpeg-decoder 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "png 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "num-rational 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "png 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1008,26 +1006,26 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ipc-channel" version = "0.2.2" -source = "git+https://github.com/servo/ipc-channel#e43fb22c431740a9bc54ce96caebd0e67d1a0586" +source = "git+https://github.com/servo/ipc-channel#10bed82904d635b2ff6a916872130868cb69b104" dependencies = [ "bincode 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1047,7 +1045,7 @@ version = "0.1.2" source = "git+https://github.com/servo/rust-mozjs#8ad6c1148fd77e5b9dc2ce0f0ab40d4f455f6f4e" dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1070,24 +1068,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "language-tags" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "layers" version = "0.2.4" -source = "git+https://github.com/servo/rust-layers#3cb5df49d7f069eea1f1f0550921c5833cb5bc7f" +source = "git+https://github.com/servo/rust-layers#d7a8a6aa73ec16127042325af4b2d5f9a1fa585d" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1099,11 +1097,11 @@ dependencies = [ name = "layout" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", @@ -1112,7 +1110,7 @@ dependencies = [ "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layout_traits 0.0.1", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", @@ -1124,15 +1122,15 @@ dependencies = [ "script_traits 0.0.1", "selectors 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1154,9 +1152,9 @@ dependencies = [ "net_traits 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1173,7 +1171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "leak" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1181,12 +1179,12 @@ name = "leaky-cow" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "leak 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "leak 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libc" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1212,8 +1210,8 @@ name = "libz-sys" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1242,7 +1240,7 @@ name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1252,10 +1250,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memchr" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1263,9 +1261,9 @@ name = "memmap" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "fs2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fs2 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1275,17 +1273,18 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "mime_guess" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1293,8 +1292,8 @@ name = "miniz-sys" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1302,7 +1301,7 @@ name = "mozjs_sys" version = "0.0.0" source = "git+https://github.com/servo/mozjs#2af5849a97a9f18acd482940ba3fa0c6797ed7eb" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1311,18 +1310,18 @@ name = "msg" version = "0.0.1" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1332,44 +1331,44 @@ name = "net" version = "0.0.1" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "brotli 0.3.20 (git+https://github.com/ende76/brotli-rs)", + "brotli 0.3.23 (git+https://github.com/ende76/brotli-rs)", "cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "device 0.0.1 (git+https://github.com/servo/devices)", "devtools_traits 0.0.1", - "flate2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "immeta 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "mime_guess 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "threadpool 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "threadpool 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "net2" -version = "0.2.19" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ws2_32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1378,16 +1377,16 @@ version = "0.0.1" dependencies = [ "cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", - "flate2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", "plugins 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1397,15 +1396,15 @@ version = "0.0.1" dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1493,17 +1492,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "num_cpus" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "objc" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1515,7 +1512,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "block 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1524,7 +1521,7 @@ name = "objc_id" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1534,41 +1531,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "offscreen_gl_context" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys-extras 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys-extras 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "libressl-pnacl-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1576,12 +1573,12 @@ dependencies = [ [[package]] name = "openssl-sys-extras" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1589,49 +1586,52 @@ name = "osmesa-sys" version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "shared_library 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_codegen" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_generator" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_macros" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_shared" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "pkg-config" @@ -1664,13 +1664,13 @@ dependencies = [ [[package]] name = "png" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1680,16 +1680,16 @@ version = "0.0.1" dependencies = [ "hbs-pow 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "task_info 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1709,30 +1709,30 @@ dependencies = [ "energymon 0.2.0 (git+https://github.com/energymon/energymon-rust.git)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "plugins 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "quasi_codegen" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi_macros" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quasi_codegen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1749,7 +1749,7 @@ name = "rand" version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1760,8 +1760,8 @@ dependencies = [ "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1770,7 +1770,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1781,7 +1781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ref_slice" -version = "0.1.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1789,8 +1789,8 @@ name = "regex" version = "0.1.69" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1808,7 +1808,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc_version" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1824,12 +1824,12 @@ name = "script" version = "0.0.1" dependencies = [ "angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)", - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1837,39 +1837,39 @@ dependencies = [ "gfx_traits 0.0.1", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "js 0.1.2 (git+https://github.com/servo/rust-mozjs)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_macros 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_macros 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "ref_filter_map 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ref_slice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ref_slice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "selectors 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1882,7 +1882,7 @@ dependencies = [ "msg 0.0.1", "plugins 0.0.1", "script 0.0.1", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1890,7 +1890,7 @@ dependencies = [ name = "script_traits" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "devtools_traits 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1898,17 +1898,17 @@ dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1918,13 +1918,13 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1935,17 +1935,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "0.7.0" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_codegen" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_macros 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_macros 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1954,15 +1954,15 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_macros" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_codegen 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1970,7 +1970,7 @@ name = "servo-egl" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1978,7 +1978,7 @@ name = "servo-fontconfig" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig-sys 2.11.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2008,20 +2008,20 @@ dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "shared_library 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-kbd 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2036,10 +2036,10 @@ dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2053,7 +2053,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2072,7 +2072,7 @@ source = "git+https://github.com/huonw/simd#03de1cd0a278ab902b4beb402d57505f3797 [[package]] name = "smallvec" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2093,18 +2093,18 @@ dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_generator 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "style" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2117,13 +2117,13 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -2131,8 +2131,8 @@ dependencies = [ name = "style_tests" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "plugins 0.0.1", @@ -2141,7 +2141,7 @@ dependencies = [ "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -2149,14 +2149,14 @@ dependencies = [ name = "style_traits" version = "0.0.1" dependencies = [ - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -2164,7 +2164,7 @@ dependencies = [ name = "task_info" version = "0.0.1" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2177,13 +2177,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2194,7 +2194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "tendril" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2209,7 +2209,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2222,16 +2222,16 @@ dependencies = [ [[package]] name = "threadpool" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "time" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2241,7 +2241,7 @@ name = "tinyfiledialogs" version = "0.1.0" source = "git+https://github.com/jdm/tinyfiledialogs#686abf781f30b360a4c265964fd3744e2f61cf2d" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2259,7 +2259,7 @@ name = "unicase" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc_version 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2280,7 +2280,7 @@ name = "unicode-script" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "harfbuzz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "harfbuzz-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2293,7 +2293,7 @@ dependencies = [ [[package]] name = "url" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2302,7 +2302,7 @@ dependencies = [ "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2331,7 +2331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "util" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2343,34 +2343,34 @@ dependencies = [ "js 0.1.2 (git+https://github.com/servo/rust-mozjs)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "util_tests" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", ] [[package]] name = "uuid" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2383,14 +2383,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wayland-client" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-scanner 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-sys 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-scanner 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-sys 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2402,20 +2403,20 @@ dependencies = [ "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-scanner" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "xml-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-sys" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2428,8 +2429,8 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2437,7 +2438,7 @@ name = "webdriver" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2448,57 +2449,57 @@ name = "webdriver_server" version = "0.0.1" dependencies = [ "compositing 0.0.1", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "plugins 0.0.1", "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "webrender" version = "0.1.0" -source = "git+https://github.com/servo/webrender#8d778dac5398cadd093136bc9cf0afbbb61a2b52" +source = "git+https://github.com/servo/webrender#e3ee5d46093d0b2bb3c14398914bc9a7a36bcfbd" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", - "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] name = "webrender_traits" version = "0.1.0" -source = "git+https://github.com/servo/webrender_traits#d1a3bb53f87891bbba8576d05260caee147dc5d8" +source = "git+https://github.com/servo/webrender_traits#7a51247cb5333d7a4560e00fe4518db328a550da" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2508,13 +2509,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2529,7 +2530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ws2_32-sys" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2541,7 +2542,7 @@ name = "x11" version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2551,7 +2552,7 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dylib 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2561,18 +2562,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "xml-rs" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "xml-rs" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2582,11 +2575,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "tendril 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "tendril 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 109d4e6d733..81a46875200 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -19,7 +19,8 @@ doc = false bench = false [features] -default = ["glutin_app", "webdriver"] +default = ["glutin_app", "webdriver", "max_log_level"] +max_log_level = ["env_logger/log/release_max_level_info"] webdriver = ["webdriver_server"] energy-profiling = ["profile_traits/energy-profiling"] @@ -75,7 +76,7 @@ libc = "0.2" url = {version = "1.0.0", features = ["heap_size", "serde", "query_encoding"]} [target.'cfg(target_os = "android")'.dependencies] -log = {version = "0.3", features = ["release_max_level_info"]} +log = "0.3" [target.'cfg(not(target_os = "windows"))'.dependencies] gaol = {git = "https://github.com/servo/gaol"} diff --git a/components/style/animation.rs b/components/style/animation.rs index 9c0242aa971..08ae32baf0c 100644 --- a/components/style/animation.rs +++ b/components/style/animation.rs @@ -158,7 +158,7 @@ impl PropertyAnimation { [Color; get_color; color], [FontSize; get_font; font_size], [FontWeight; get_font; font_weight], - [Height; get_box; height], + [Height; get_position; height], [Left; get_position; left], [LineHeight; get_inheritedtext; line_height], [MarginBottom; get_margin; margin_bottom], @@ -181,7 +181,7 @@ impl PropertyAnimation { [Top; get_position; top], [VerticalAlign; get_box; vertical_align], [Visibility; get_inheritedbox; visibility], - [Width; get_box; width], + [Width; get_position; width], [ZIndex; get_position; z_index]); let property_animation = PropertyAnimation { @@ -256,7 +256,7 @@ impl PropertyAnimation { [Color; mutate_color; color], [FontSize; mutate_font; font_size], [FontWeight; mutate_font; font_weight], - [Height; mutate_box; height], + [Height; mutate_position; height], [Left; mutate_position; left], [LineHeight; mutate_inheritedtext; line_height], [MarginBottom; mutate_margin; margin_bottom], @@ -281,7 +281,7 @@ impl PropertyAnimation { [Transform; mutate_effects; transform], [VerticalAlign; mutate_box; vertical_align], [Visibility; mutate_inheritedbox; visibility], - [Width; mutate_box; width], + [Width; mutate_position; width], [ZIndex; mutate_position; z_index]); } diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhand/box.mako.rs index f1e3cfb5be5..a88db8bf03e 100644 --- a/components/style/properties/longhand/box.mako.rs +++ b/components/style/properties/longhand/box.mako.rs @@ -122,16 +122,6 @@ ${helpers.single_keyword("clear", "none left right both", gecko_ffi_name="mBreak </%helpers:longhand> -${helpers.predefined_type("width", - "LengthOrPercentageOrAuto", - "computed::LengthOrPercentageOrAuto::Auto", - "parse_non_negative")} - -${helpers.predefined_type("height", - "LengthOrPercentageOrAuto", - "computed::LengthOrPercentageOrAuto::Auto", - "parse_non_negative")} - <%helpers:longhand name="vertical-align"> use cssparser::ToCss; use std::fmt; diff --git a/components/style/properties/longhand/font.mako.rs b/components/style/properties/longhand/font.mako.rs index 59523c5a2a0..f83a536166e 100644 --- a/components/style/properties/longhand/font.mako.rs +++ b/components/style/properties/longhand/font.mako.rs @@ -173,6 +173,7 @@ ${helpers.single_keyword("font-variant", "normal small-caps")} pub mod computed_value { use std::fmt; #[derive(PartialEq, Eq, Copy, Clone, Hash, Deserialize, Serialize, HeapSizeOf, Debug)] + #[repr(u16)] pub enum T { % for weight in range(100, 901, 100): Weight${weight} = ${weight}, diff --git a/components/style/properties/longhand/list.mako.rs b/components/style/properties/longhand/list.mako.rs index 98edb3ab23b..309e248c2dd 100644 --- a/components/style/properties/longhand/list.mako.rs +++ b/components/style/properties/longhand/list.mako.rs @@ -13,13 +13,17 @@ ${helpers.single_keyword("list-style-position", "outside inside")} // decimal-leading-zero, armenian, upper-armenian, lower-armenian, georgian, lower-roman, // upper-roman // +// TODO(bholley): Missing quite a few gecko properties here as well. +// // [1]: http://dev.w3.org/csswg/css-counter-styles/ ${helpers.single_keyword("list-style-type", """ - disc none circle square decimal arabic-indic bengali cambodian cjk-decimal devanagari - gujarati gurmukhi kannada khmer lao malayalam mongolian myanmar oriya persian telugu thai - tibetan lower-alpha upper-alpha cjk-earthly-branch cjk-heavenly-stem lower-greek hiragana - hiragana-iroha katakana katakana-iroha disclosure-open disclosure-closed -""")} + disc none circle square decimal lower-alpha upper-alpha disclosure-open disclosure-closed +""", extra_servo_values="""arabic-indic bengali cambodian cjk-decimal devanagari + gujarati gurmukhi kannada khmer lao malayalam mongolian + myanmar oriya persian telugu thai tibetan cjk-earthly-branch + cjk-heavenly-stem lower-greek hiragana hiragana-iroha katakana + katakana-iroha""", + gecko_constant_prefix="NS_STYLE_LIST_STYLE")} <%helpers:longhand name="list-style-image"> use cssparser::{ToCss, Token}; diff --git a/components/style/properties/longhand/position.mako.rs b/components/style/properties/longhand/position.mako.rs index 41dc76ee3b6..c4ea596758d 100644 --- a/components/style/properties/longhand/position.mako.rs +++ b/components/style/properties/longhand/position.mako.rs @@ -96,6 +96,16 @@ ${helpers.predefined_type("flex-basis", ${helpers.single_keyword("flex-wrap", "nowrap wrap wrap-reverse", products="gecko")} +${helpers.predefined_type("width", + "LengthOrPercentageOrAuto", + "computed::LengthOrPercentageOrAuto::Auto", + "parse_non_negative")} + +${helpers.predefined_type("height", + "LengthOrPercentageOrAuto", + "computed::LengthOrPercentageOrAuto::Auto", + "parse_non_negative")} + ${helpers.predefined_type("min-width", "LengthOrPercentage", "computed::LengthOrPercentage::Length(Au(0))", diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index 6582d5a6020..0299b3a4276 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -972,18 +972,18 @@ impl ServoComputedValues { #[inline] pub fn content_inline_size(&self) -> computed::LengthOrPercentageOrAuto { - let box_style = self.get_box(); + let position_style = self.get_position(); if self.writing_mode.is_vertical() { - box_style.height + position_style.height } else { - box_style.width + position_style.width } } #[inline] pub fn content_block_size(&self) -> computed::LengthOrPercentageOrAuto { - let box_style = self.get_box(); - if self.writing_mode.is_vertical() { box_style.width } else { box_style.height } + let position_style = self.get_position(); + if self.writing_mode.is_vertical() { position_style.width } else { position_style.height } } #[inline] diff --git a/components/style/values.rs b/components/style/values.rs index 77a521469ad..2f295bd8775 100644 --- a/components/style/values.rs +++ b/components/style/values.rs @@ -1837,6 +1837,21 @@ pub mod computed { Auto, Calc(CalcLengthOrPercentage), } + + impl LengthOrPercentageOrAuto { + /// Returns true if the computed value is absolute 0 or 0%. + /// + /// (Returns false for calc() values, even if ones that may resolve to zero.) + #[inline] + pub fn is_definitely_zero(&self) -> bool { + use self::LengthOrPercentageOrAuto::*; + match *self { + Length(Au(0)) | Percentage(0.0) => true, + Length(_) | Percentage(_) | Calc(_) | Auto => false + } + } + } + impl fmt::Debug for LengthOrPercentageOrAuto { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 0537c3fff72..21e513951cd 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -2,42 +2,42 @@ name = "embedding" version = "0.0.1" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "devtools 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", "js 0.1.2 (git+https://github.com/servo/rust-mozjs)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "script 0.0.1", "script_traits 0.0.1", "servo 0.0.1", "style 0.0.1", "style_traits 0.0.1", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "aho-corasick" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -50,20 +50,20 @@ name = "angle" version = "0.1.0" source = "git+https://github.com/emilio/angle?branch=servo#eefe3506ae13e8ace811ca544fd6b4a5f0db0a04" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "app_units" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -77,24 +77,24 @@ dependencies = [ [[package]] name = "aster" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "azure" -version = "0.4.3" -source = "git+https://github.com/servo/rust-azure#bb2fab861ff63fcc185e5dd7557a021c01e0981d" +version = "0.4.4" +source = "git+https://github.com/servo/rust-azure#7b0164d1d79957b2a59e9e103c02a53761c74b9d" dependencies = [ - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "servo-skia 0.20130412.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -106,20 +106,21 @@ name = "backtrace" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "backtrace-sys" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -130,7 +131,7 @@ dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -140,11 +141,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bitflags" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "bitflags" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -155,22 +151,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "blurz" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "dbus 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "dbus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "brotli" -version = "0.3.20" -source = "git+https://github.com/ende76/brotli-rs#c243045b88b2d2924c35269586fa9b770184c74c" +version = "0.3.23" +source = "git+https://github.com/ende76/brotli-rs#d8507fd07e9fa57ed8251d5dc500dcd62df62c7c" [[package]] name = "browserhtml" -version = "0.1.4" -source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#0ca50842ba2769a05f2f00f1fd3bfaed4baf03ab" +version = "0.1.5" +source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#146e7909211792ac6d955d87339c547aeb517136" [[package]] name = "byteorder" @@ -181,15 +177,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "canvas" version = "0.0.1" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -199,16 +195,16 @@ dependencies = [ name = "canvas_traits" version = "0.0.1" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "plugins 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -231,17 +227,17 @@ name = "cgl" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "clipboard" version = "0.1.2" -source = "git+https://github.com/aweinstock314/rust-clipboard#4fe9892d7bf8bac075aa60493c6eee7a83e24b7f" +source = "git+https://github.com/aweinstock314/rust-clipboard#f4c5c1d3c1759f0a167091405d11af1f9584fb1f" dependencies = [ "clipboard-win 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "objc-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -262,7 +258,7 @@ name = "cmake" version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -272,8 +268,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -285,8 +281,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "compositing" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "canvas 0.0.1", "canvas_traits 0.0.1", "clipboard 0.1.2 (git+https://github.com/aweinstock314/rust-clipboard)", @@ -295,8 +291,8 @@ dependencies = [ "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gfx_traits 0.0.1", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "layout_traits 0.0.1", @@ -304,16 +300,16 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender 0.1.0 (git+https://github.com/servo/webrender)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -324,27 +320,27 @@ name = "cookie" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-foundation" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-foundation-sys" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -352,9 +348,9 @@ name = "core-graphics" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -362,27 +358,27 @@ name = "core-text" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam" -version = "0.1.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -396,10 +392,10 @@ dependencies = [ [[package]] name = "dbus" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -422,9 +418,9 @@ dependencies = [ [[package]] name = "device" version = "0.0.1" -source = "git+https://github.com/servo/devices#eeac5abfd548b63dcc48873261609922351551e1" +source = "git+https://github.com/servo/devices#cac0952154f65b416acef273a6d1099421ce113e" dependencies = [ - "blurz 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "blurz 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -432,14 +428,14 @@ name = "devtools" version = "0.0.1" dependencies = [ "devtools_traits 0.0.1", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "msg 0.0.1", "plugins 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -450,13 +446,13 @@ dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "msg 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -481,7 +477,7 @@ name = "dylib" version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -568,8 +564,8 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -583,10 +579,10 @@ dependencies = [ [[package]] name = "flate2" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -600,16 +596,16 @@ name = "freetype" version = "0.1.0" source = "git+https://github.com/servo/rust-freetype#d564ff90a3c69d987f5c015d7ec034cfaee21aff" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "fs2" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -625,16 +621,16 @@ dependencies = [ [[package]] name = "gaol" version = "0.0.1" -source = "git+https://github.com/servo/gaol#cbb2518029901f078f871a87ebe05cf96d727713" +source = "git+https://github.com/servo/gaol#545c703ebfe7a3a0d7129eb40981527f5d680860" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gcc" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -654,23 +650,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "gfx" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "gfx_traits 0.0.1", - "harfbuzz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "harfbuzz-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -680,18 +676,18 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-skia 0.20130412.6 (registry+https://github.com/rust-lang/crates.io-index)", "simd 0.1.0 (git+https://github.com/huonw/simd)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -701,15 +697,15 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "msg 0.0.1", "plugins 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -728,12 +724,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gleam" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -751,7 +747,7 @@ dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "msg 0.0.1", "net_traits 0.0.1", @@ -759,7 +755,7 @@ dependencies = [ "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-glutin 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -771,15 +767,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "harfbuzz-sys" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -797,7 +793,7 @@ name = "hbs-common-sys" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -806,7 +802,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hbs-pow-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -816,7 +812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hbs-builder 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "hbs-common-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -842,46 +838,46 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "tendril 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "tendril 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "httparse" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hyper" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "httparse 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "language-tags 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -896,7 +892,7 @@ dependencies = [ [[package]] name = "image" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -904,8 +900,10 @@ dependencies = [ "gif 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "jpeg-decoder 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "png 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "num-rational 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "png 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -929,26 +927,26 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ipc-channel" version = "0.2.2" -source = "git+https://github.com/servo/ipc-channel#e43fb22c431740a9bc54ce96caebd0e67d1a0586" +source = "git+https://github.com/servo/ipc-channel#10bed82904d635b2ff6a916872130868cb69b104" dependencies = [ "bincode 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -968,7 +966,7 @@ version = "0.1.2" source = "git+https://github.com/servo/rust-mozjs#8ad6c1148fd77e5b9dc2ce0f0ab40d4f455f6f4e" dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -991,24 +989,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "language-tags" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "layers" version = "0.2.4" -source = "git+https://github.com/servo/rust-layers#3cb5df49d7f069eea1f1f0550921c5833cb5bc7f" +source = "git+https://github.com/servo/rust-layers#d7a8a6aa73ec16127042325af4b2d5f9a1fa585d" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1020,11 +1018,11 @@ dependencies = [ name = "layout" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", @@ -1033,7 +1031,7 @@ dependencies = [ "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layout_traits 0.0.1", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", @@ -1045,15 +1043,15 @@ dependencies = [ "script_traits 0.0.1", "selectors 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1068,9 +1066,9 @@ dependencies = [ "net_traits 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1087,7 +1085,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "leak" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1095,12 +1093,12 @@ name = "leaky-cow" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "leak 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "leak 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libc" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1126,8 +1124,8 @@ name = "libz-sys" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1156,7 +1154,7 @@ name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1166,10 +1164,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memchr" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1177,9 +1175,9 @@ name = "memmap" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "fs2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fs2 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1189,17 +1187,18 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "mime_guess" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1207,8 +1206,8 @@ name = "miniz-sys" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1216,7 +1215,7 @@ name = "mozjs_sys" version = "0.0.0" source = "git+https://github.com/servo/mozjs#2af5849a97a9f18acd482940ba3fa0c6797ed7eb" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1225,18 +1224,18 @@ name = "msg" version = "0.0.1" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1246,44 +1245,44 @@ name = "net" version = "0.0.1" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "brotli 0.3.20 (git+https://github.com/ende76/brotli-rs)", + "brotli 0.3.23 (git+https://github.com/ende76/brotli-rs)", "cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "device 0.0.1 (git+https://github.com/servo/devices)", "devtools_traits 0.0.1", - "flate2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "immeta 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "mime_guess 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "threadpool 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "threadpool 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "net2" -version = "0.2.19" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ws2_32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1292,15 +1291,15 @@ version = "0.0.1" dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1381,17 +1380,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "num_cpus" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "objc" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1403,7 +1400,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "block 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1412,7 +1409,7 @@ name = "objc_id" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1422,41 +1419,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "offscreen_gl_context" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys-extras 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys-extras 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "libressl-pnacl-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1464,12 +1461,12 @@ dependencies = [ [[package]] name = "openssl-sys-extras" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1477,49 +1474,52 @@ name = "osmesa-sys" version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "shared_library 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_codegen" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_generator" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_macros" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_shared" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "pkg-config" @@ -1543,13 +1543,13 @@ dependencies = [ [[package]] name = "png" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1559,16 +1559,16 @@ version = "0.0.1" dependencies = [ "hbs-pow 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "task_info 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1578,30 +1578,30 @@ version = "0.0.1" dependencies = [ "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "plugins 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "quasi_codegen" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi_macros" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quasi_codegen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1618,7 +1618,7 @@ name = "rand" version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1629,8 +1629,8 @@ dependencies = [ "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1639,7 +1639,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1650,7 +1650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ref_slice" -version = "0.1.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1658,8 +1658,8 @@ name = "regex" version = "0.1.69" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1677,7 +1677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc_version" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1693,12 +1693,12 @@ name = "script" version = "0.0.1" dependencies = [ "angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)", - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1706,39 +1706,39 @@ dependencies = [ "gfx_traits 0.0.1", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "js 0.1.2 (git+https://github.com/servo/rust-mozjs)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_macros 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_macros 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "ref_filter_map 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ref_slice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ref_slice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "selectors 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1748,7 +1748,7 @@ dependencies = [ name = "script_traits" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "devtools_traits 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1756,17 +1756,17 @@ dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1776,13 +1776,13 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1793,17 +1793,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "0.7.0" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_codegen" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_macros 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_macros 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1812,22 +1812,22 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_macros" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_codegen 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "servo" version = "0.0.1" dependencies = [ - "browserhtml 0.1.4 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)", + "browserhtml 0.1.5 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)", "canvas 0.0.1", "canvas_traits 0.0.1", "compositing 0.0.1", @@ -1837,12 +1837,12 @@ dependencies = [ "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "layout 0.0.1", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", @@ -1852,7 +1852,7 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "style 0.0.1", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webdriver_server 0.0.1", "webrender 0.1.0 (git+https://github.com/servo/webrender)", @@ -1864,7 +1864,7 @@ name = "servo-egl" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1872,7 +1872,7 @@ name = "servo-fontconfig" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig-sys 2.11.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1902,20 +1902,20 @@ dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "shared_library 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-kbd 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1930,10 +1930,10 @@ dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1947,7 +1947,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1966,7 +1966,7 @@ source = "git+https://github.com/huonw/simd#03de1cd0a278ab902b4beb402d57505f3797 [[package]] name = "smallvec" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1987,18 +1987,18 @@ dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_generator 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "style" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2011,13 +2011,13 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -2025,14 +2025,14 @@ dependencies = [ name = "style_traits" version = "0.0.1" dependencies = [ - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -2040,7 +2040,7 @@ dependencies = [ name = "task_info" version = "0.0.1" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2053,13 +2053,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2070,7 +2070,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "tendril" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2085,7 +2085,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2098,16 +2098,16 @@ dependencies = [ [[package]] name = "threadpool" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "time" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2117,7 +2117,7 @@ name = "tinyfiledialogs" version = "0.1.0" source = "git+https://github.com/jdm/tinyfiledialogs#686abf781f30b360a4c265964fd3744e2f61cf2d" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2135,7 +2135,7 @@ name = "unicase" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc_version 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2156,7 +2156,7 @@ name = "unicode-script" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "harfbuzz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "harfbuzz-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2169,7 +2169,7 @@ dependencies = [ [[package]] name = "url" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2178,7 +2178,7 @@ dependencies = [ "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2207,7 +2207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "util" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2219,23 +2219,23 @@ dependencies = [ "js 0.1.2 (git+https://github.com/servo/rust-mozjs)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "uuid" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2248,14 +2248,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wayland-client" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-scanner 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-sys 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-scanner 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-sys 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2267,20 +2268,20 @@ dependencies = [ "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-scanner" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "xml-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-sys" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2293,8 +2294,8 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2302,7 +2303,7 @@ name = "webdriver" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2313,57 +2314,57 @@ name = "webdriver_server" version = "0.0.1" dependencies = [ "compositing 0.0.1", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "plugins 0.0.1", "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "webrender" version = "0.1.0" -source = "git+https://github.com/servo/webrender#8d778dac5398cadd093136bc9cf0afbbb61a2b52" +source = "git+https://github.com/servo/webrender#e3ee5d46093d0b2bb3c14398914bc9a7a36bcfbd" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", - "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] name = "webrender_traits" version = "0.1.0" -source = "git+https://github.com/servo/webrender_traits#d1a3bb53f87891bbba8576d05260caee147dc5d8" +source = "git+https://github.com/servo/webrender_traits#7a51247cb5333d7a4560e00fe4518db328a550da" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2373,13 +2374,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2394,7 +2395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ws2_32-sys" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2406,7 +2407,7 @@ name = "x11" version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2416,7 +2417,7 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dylib 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2426,18 +2427,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "xml-rs" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "xml-rs" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2447,11 +2440,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "tendril 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "tendril 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock index 680e0dd1f47..617a8a508cd 100644 --- a/ports/geckolib/Cargo.lock +++ b/ports/geckolib/Cargo.lock @@ -2,40 +2,49 @@ name = "geckoservo" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "selectors 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] [[package]] +name = "aho-corasick" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "app_units" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "aster" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -43,20 +52,21 @@ name = "backtrace" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "backtrace-sys" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -67,7 +77,7 @@ dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -87,15 +97,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -181,6 +191,15 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "env_logger" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "euclid" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -190,8 +209,8 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -200,6 +219,11 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "gcc" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "getopts" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -230,16 +254,16 @@ dependencies = [ [[package]] name = "ipc-channel" version = "0.2.2" -source = "git+https://github.com/servo/ipc-channel#e43fb22c431740a9bc54ce96caebd0e67d1a0586" +source = "git+https://github.com/servo/ipc-channel#10bed82904d635b2ff6a916872130868cb69b104" dependencies = [ "bincode 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -253,17 +277,12 @@ dependencies = [ [[package]] name = "lazy_static" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "lazy_static" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -277,6 +296,14 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "memchr" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "num" version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -344,26 +371,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "num_cpus" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_generator" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_shared" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -375,23 +400,23 @@ dependencies = [ [[package]] name = "quasi" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "quasi_codegen" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi_macros" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quasi_codegen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -408,10 +433,27 @@ name = "rand" version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex" +version = "0.1.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "aho-corasick 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "thread_local 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] +name = "regex-syntax" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "rustc-serialize" version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -422,42 +464,42 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde" -version = "0.7.0" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_codegen" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_macros 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_macros 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_macros" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_codegen 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "smallvec" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -469,18 +511,18 @@ dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_generator 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "style" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -493,13 +535,13 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -507,14 +549,14 @@ dependencies = [ name = "style_traits" version = "0.0.1" dependencies = [ - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -524,12 +566,29 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "thread-id" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thread_local" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "time" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -556,7 +615,7 @@ dependencies = [ [[package]] name = "url" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -564,14 +623,19 @@ dependencies = [ "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] +name = "utf8-ranges" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "util" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -582,23 +646,23 @@ dependencies = [ "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "uuid" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml index b672f8cc298..2778792afcd 100644 --- a/ports/geckolib/Cargo.toml +++ b/ports/geckolib/Cargo.toml @@ -27,3 +27,4 @@ log = {version = "0.3.5", features = ["release_max_level_info"]} plugins = {path = "../../components/plugins"} util = {path = "../../components/util"} style = {path = "../../components/style", features = ["gecko"]} +env_logger = "0.3" diff --git a/ports/geckolib/bindings.rs b/ports/geckolib/bindings.rs index 234f309378d..846944920e8 100644 --- a/ports/geckolib/bindings.rs +++ b/ports/geckolib/bindings.rs @@ -69,6 +69,9 @@ extern "C" { pub fn Gecko_SetNodeData(node: *mut RawGeckoNode, data: *mut ServoNodeData); pub fn Servo_DropNodeData(data: *mut ServoNodeData); + pub fn Gecko_SetListStyleType(style_struct: *mut nsStyleList, type_: u32); + pub fn Gecko_CopyListStyleTypeFrom(dst: *mut nsStyleList, + src: *const nsStyleList); pub fn Servo_StylesheetFromUTF8Bytes(bytes: *const u8, length: u32, parsing_mode: SheetParsingMode) -> *mut RawServoStyleSheet; @@ -101,10 +104,12 @@ extern "C" { set: *mut RawServoStyleSet, is_probe: bool) -> *mut ServoComputedValues; + pub fn Servo_InheritComputedValues(parent_style: *mut ServoComputedValues) + -> *mut ServoComputedValues; pub fn Servo_AddRefComputedValues(arg1: *mut ServoComputedValues); pub fn Servo_ReleaseComputedValues(arg1: *mut ServoComputedValues); - pub fn Gecko_GetAttrAsUTF8(element: *mut RawGeckoElement, ns: *const u8, - name: *const u8, length: *mut u32) + pub fn Gecko_GetAttrAsUTF8(element: *mut RawGeckoElement, ns: *const u8, nslen: u32, + name: *const u8, namelen: u32, length: *mut u32) -> *const ::std::os::raw::c_char; pub fn Gecko_GetAtomAsUTF16(atom: *mut nsIAtom, length: *mut u32) -> *const u16; @@ -112,6 +117,7 @@ extern "C" { -> *const u16; pub fn Gecko_Namespace(element: *mut RawGeckoElement, length: *mut u32) -> *const u16; + pub fn Servo_Initialize(); pub fn Servo_RestyleDocument(doc: *mut RawGeckoDocument, set: *mut RawServoStyleSet); pub fn Gecko_Construct_nsStyleFont(ptr: *mut nsStyleFont); diff --git a/ports/geckolib/gecko_style_structs.rs b/ports/geckolib/gecko_style_structs.rs index cf8f4fb3c17..884eb892c3a 100644 --- a/ports/geckolib/gecko_style_structs.rs +++ b/ports/geckolib/gecko_style_structs.rs @@ -573,7 +573,7 @@ pub const NS_STYLE_TEXT_TRANSFORM_NONE: ::std::os::raw::c_uint = 0; pub const NS_STYLE_TEXT_TRANSFORM_CAPITALIZE: ::std::os::raw::c_uint = 1; pub const NS_STYLE_TEXT_TRANSFORM_LOWERCASE: ::std::os::raw::c_uint = 2; pub const NS_STYLE_TEXT_TRANSFORM_UPPERCASE: ::std::os::raw::c_uint = 3; -pub const NS_STYLE_TEXT_TRANSFORM_FULLWIDTH: ::std::os::raw::c_uint = 4; +pub const NS_STYLE_TEXT_TRANSFORM_FULL_WIDTH: ::std::os::raw::c_uint = 4; pub const NS_STYLE_TOP_LAYER_NONE: ::std::os::raw::c_uint = 0; pub const NS_STYLE_TOP_LAYER_TOP: ::std::os::raw::c_uint = 1; pub const NS_STYLE_TRANSFORM_BOX_BORDER_BOX: ::std::os::raw::c_uint = 0; @@ -1547,8 +1547,10 @@ fn bindgen_test_layout_nsAutoString() { pub enum Dont_Instantiate_nsTArray_of { } pub enum Instead_Use_nsTArray_of { } #[repr(C)] -pub struct nsTArrayElementTraits<> { - pub _phantom0: ::std::marker::PhantomData<nsAutoString>, +#[derive(Debug, Copy)] +pub struct nsTArrayElementTraits; +impl ::std::clone::Clone for nsTArrayElementTraits { + fn clone(&self) -> Self { *self } } #[repr(C)] #[derive(Debug)] @@ -2231,7 +2233,7 @@ pub struct PLDHashTable { pub mEntryCount: u32, pub mRemovedCount: u32, pub mEntryStore: [u64; 2usize], - pub mChecker: Checker, + pub mChecker: ::std::cell::UnsafeCell<Checker>, } #[repr(C)] pub struct PLDHashTable_EntryStore { @@ -2385,7 +2387,10 @@ pub enum CSSVariableResolver { } #[repr(C)] pub struct CSSVariableValues { pub mVariableIDs: [u64; 6usize], - pub mVariables: u64, + /** + * Array of variables, indexed by variable ID. + */ + pub mVariables: nsTArray<CSSVariableValues_Variable>, } #[repr(C)] #[derive(Debug)] @@ -2496,6 +2501,34 @@ pub enum gfxContentType { COLOR_ALPHA = 12288, SENTINEL = 65535, } +#[repr(C)] +#[derive(Debug, Copy)] +pub struct piecewise_construct_t; +impl ::std::clone::Clone for piecewise_construct_t { + fn clone(&self) -> Self { *self } +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct pair<_T1, _T2> { + pub first: _T1, + pub second: _T2, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct __make_pair_return_impl<_Tp> { + pub _phantom0: ::std::marker::PhantomData<_Tp>, +} +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct __make_pair_return<_Tp> { + pub _phantom0: ::std::marker::PhantomData<_Tp>, +} +#[repr(C)] +#[derive(Debug, Copy)] +pub struct __get_pair; +impl ::std::clone::Clone for __get_pair { + fn clone(&self) -> Self { *self } +} pub type Float = f32; #[repr(i8)] #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] @@ -2890,8 +2923,9 @@ fn bindgen_test_layout_FontFamilyName() { * font type is used to preserve the variable font fallback behavior */ #[repr(C)] +#[derive(Debug)] pub struct FontFamilyList { - pub mFontlist: u64, + pub mFontlist: nsTArray<FontFamilyName>, pub mDefaultFontType: FontFamilyType, } #[test] @@ -2959,9 +2993,9 @@ pub struct nsFont { pub synthesis: u8, pub size: nscoord, pub sizeAdjust: f32, - pub alternateValues: u64, + pub alternateValues: nsTArray<gfxAlternateValue>, pub featureValueLookup: RefPtr<gfxFontFeatureValueSet>, - pub fontFeatureSettings: u64, + pub fontFeatureSettings: nsTArray<gfxFontFeature>, pub languageOverride: nsString, } #[test] @@ -3048,414 +3082,416 @@ pub enum nsCSSProperty { eCSSProperty_background_color = 16, eCSSProperty_background_image = 17, eCSSProperty_background_origin = 18, - eCSSProperty_background_position = 19, - eCSSProperty_background_repeat = 20, - eCSSProperty_background_size = 21, - eCSSProperty_binding = 22, - eCSSProperty_block_size = 23, - eCSSProperty_border_block_end_color = 24, - eCSSProperty_border_block_end_style = 25, - eCSSProperty_border_block_end_width = 26, - eCSSProperty_border_block_start_color = 27, - eCSSProperty_border_block_start_style = 28, - eCSSProperty_border_block_start_width = 29, - eCSSProperty_border_bottom_color = 30, - eCSSProperty_border_bottom_colors = 31, - eCSSProperty_border_bottom_left_radius = 32, - eCSSProperty_border_bottom_right_radius = 33, - eCSSProperty_border_bottom_style = 34, - eCSSProperty_border_bottom_width = 35, - eCSSProperty_border_collapse = 36, - eCSSProperty_border_image_outset = 37, - eCSSProperty_border_image_repeat = 38, - eCSSProperty_border_image_slice = 39, - eCSSProperty_border_image_source = 40, - eCSSProperty_border_image_width = 41, - eCSSProperty_border_inline_end_color = 42, - eCSSProperty_border_inline_end_style = 43, - eCSSProperty_border_inline_end_width = 44, - eCSSProperty_border_inline_start_color = 45, - eCSSProperty_border_inline_start_style = 46, - eCSSProperty_border_inline_start_width = 47, - eCSSProperty_border_left_color = 48, - eCSSProperty_border_left_colors = 49, - eCSSProperty_border_left_style = 50, - eCSSProperty_border_left_width = 51, - eCSSProperty_border_right_color = 52, - eCSSProperty_border_right_colors = 53, - eCSSProperty_border_right_style = 54, - eCSSProperty_border_right_width = 55, - eCSSProperty_border_spacing = 56, - eCSSProperty_border_top_color = 57, - eCSSProperty_border_top_colors = 58, - eCSSProperty_border_top_left_radius = 59, - eCSSProperty_border_top_right_radius = 60, - eCSSProperty_border_top_style = 61, - eCSSProperty_border_top_width = 62, - eCSSProperty_bottom = 63, - eCSSProperty_box_align = 64, - eCSSProperty_box_decoration_break = 65, - eCSSProperty_box_direction = 66, - eCSSProperty_box_flex = 67, - eCSSProperty_box_ordinal_group = 68, - eCSSProperty_box_orient = 69, - eCSSProperty_box_pack = 70, - eCSSProperty_box_shadow = 71, - eCSSProperty_box_sizing = 72, - eCSSProperty_caption_side = 73, - eCSSProperty_clear = 74, - eCSSProperty_clip = 75, - eCSSProperty_clip_path = 76, - eCSSProperty_clip_rule = 77, - eCSSProperty_color = 78, - eCSSProperty_color_adjust = 79, - eCSSProperty_color_interpolation = 80, - eCSSProperty_color_interpolation_filters = 81, - eCSSProperty__moz_column_count = 82, - eCSSProperty__moz_column_fill = 83, - eCSSProperty__moz_column_gap = 84, - eCSSProperty__moz_column_rule_color = 85, - eCSSProperty__moz_column_rule_style = 86, - eCSSProperty__moz_column_rule_width = 87, - eCSSProperty__moz_column_width = 88, - eCSSProperty_contain = 89, - eCSSProperty_content = 90, - eCSSProperty__moz_control_character_visibility = 91, - eCSSProperty_counter_increment = 92, - eCSSProperty_counter_reset = 93, - eCSSProperty_cursor = 94, - eCSSProperty_direction = 95, - eCSSProperty_display = 96, - eCSSProperty_dominant_baseline = 97, - eCSSProperty_empty_cells = 98, - eCSSProperty_fill = 99, - eCSSProperty_fill_opacity = 100, - eCSSProperty_fill_rule = 101, - eCSSProperty_filter = 102, - eCSSProperty_flex_basis = 103, - eCSSProperty_flex_direction = 104, - eCSSProperty_flex_grow = 105, - eCSSProperty_flex_shrink = 106, - eCSSProperty_flex_wrap = 107, - eCSSProperty_float = 108, - eCSSProperty_float_edge = 109, - eCSSProperty_flood_color = 110, - eCSSProperty_flood_opacity = 111, - eCSSProperty_font_family = 112, - eCSSProperty_font_feature_settings = 113, - eCSSProperty_font_kerning = 114, - eCSSProperty_font_language_override = 115, - eCSSProperty_font_size = 116, - eCSSProperty_font_size_adjust = 117, - eCSSProperty_font_stretch = 118, - eCSSProperty_font_style = 119, - eCSSProperty_font_synthesis = 120, - eCSSProperty_font_variant_alternates = 121, - eCSSProperty_font_variant_caps = 122, - eCSSProperty_font_variant_east_asian = 123, - eCSSProperty_font_variant_ligatures = 124, - eCSSProperty_font_variant_numeric = 125, - eCSSProperty_font_variant_position = 126, - eCSSProperty_font_weight = 127, - eCSSProperty_force_broken_image_icon = 128, - eCSSProperty_grid_auto_columns = 129, - eCSSProperty_grid_auto_flow = 130, - eCSSProperty_grid_auto_rows = 131, - eCSSProperty_grid_column_end = 132, - eCSSProperty_grid_column_gap = 133, - eCSSProperty_grid_column_start = 134, - eCSSProperty_grid_row_end = 135, - eCSSProperty_grid_row_gap = 136, - eCSSProperty_grid_row_start = 137, - eCSSProperty_grid_template_areas = 138, - eCSSProperty_grid_template_columns = 139, - eCSSProperty_grid_template_rows = 140, - eCSSProperty_height = 141, - eCSSProperty_hyphens = 142, - eCSSProperty_image_orientation = 143, - eCSSProperty_image_region = 144, - eCSSProperty_image_rendering = 145, - eCSSProperty_ime_mode = 146, - eCSSProperty_inline_size = 147, - eCSSProperty_isolation = 148, - eCSSProperty_justify_content = 149, - eCSSProperty_justify_items = 150, - eCSSProperty_justify_self = 151, - eCSSProperty__x_lang = 152, - eCSSProperty_left = 153, - eCSSProperty_letter_spacing = 154, - eCSSProperty_lighting_color = 155, - eCSSProperty_line_height = 156, - eCSSProperty_list_style_image = 157, - eCSSProperty_list_style_position = 158, - eCSSProperty_list_style_type = 159, - eCSSProperty_margin_block_end = 160, - eCSSProperty_margin_block_start = 161, - eCSSProperty_margin_bottom = 162, - eCSSProperty_margin_inline_end = 163, - eCSSProperty_margin_inline_start = 164, - eCSSProperty_margin_left = 165, - eCSSProperty_margin_right = 166, - eCSSProperty_margin_top = 167, - eCSSProperty_marker_end = 168, - eCSSProperty_marker_mid = 169, - eCSSProperty_marker_offset = 170, - eCSSProperty_marker_start = 171, - eCSSProperty_mask = 172, - eCSSProperty_mask_type = 173, - eCSSProperty_math_display = 174, - eCSSProperty_math_variant = 175, - eCSSProperty_max_block_size = 176, - eCSSProperty_max_height = 177, - eCSSProperty_max_inline_size = 178, - eCSSProperty_max_width = 179, - eCSSProperty_min_block_size = 180, - eCSSProperty__moz_min_font_size_ratio = 181, - eCSSProperty_min_height = 182, - eCSSProperty_min_inline_size = 183, - eCSSProperty_min_width = 184, - eCSSProperty_mix_blend_mode = 185, - eCSSProperty_object_fit = 186, - eCSSProperty_object_position = 187, - eCSSProperty_offset_block_end = 188, - eCSSProperty_offset_block_start = 189, - eCSSProperty_offset_inline_end = 190, - eCSSProperty_offset_inline_start = 191, - eCSSProperty_opacity = 192, - eCSSProperty_order = 193, - eCSSProperty_orient = 194, - eCSSProperty_osx_font_smoothing = 195, - eCSSProperty_outline_color = 196, - eCSSProperty_outline_offset = 197, - eCSSProperty__moz_outline_radius_bottomLeft = 198, - eCSSProperty__moz_outline_radius_bottomRight = 199, - eCSSProperty__moz_outline_radius_topLeft = 200, - eCSSProperty__moz_outline_radius_topRight = 201, - eCSSProperty_outline_style = 202, - eCSSProperty_outline_width = 203, - eCSSProperty_overflow_clip_box = 204, - eCSSProperty_overflow_x = 205, - eCSSProperty_overflow_y = 206, - eCSSProperty_padding_block_end = 207, - eCSSProperty_padding_block_start = 208, - eCSSProperty_padding_bottom = 209, - eCSSProperty_padding_inline_end = 210, - eCSSProperty_padding_inline_start = 211, - eCSSProperty_padding_left = 212, - eCSSProperty_padding_right = 213, - eCSSProperty_padding_top = 214, - eCSSProperty_page_break_after = 215, - eCSSProperty_page_break_before = 216, - eCSSProperty_page_break_inside = 217, - eCSSProperty_paint_order = 218, - eCSSProperty_perspective = 219, - eCSSProperty_perspective_origin = 220, - eCSSProperty_pointer_events = 221, - eCSSProperty_position = 222, - eCSSProperty_quotes = 223, - eCSSProperty_resize = 224, - eCSSProperty_right = 225, - eCSSProperty_ruby_align = 226, - eCSSProperty_ruby_position = 227, - eCSSProperty_script_level = 228, - eCSSProperty_script_min_size = 229, - eCSSProperty_script_size_multiplier = 230, - eCSSProperty_scroll_behavior = 231, - eCSSProperty_scroll_snap_coordinate = 232, - eCSSProperty_scroll_snap_destination = 233, - eCSSProperty_scroll_snap_points_x = 234, - eCSSProperty_scroll_snap_points_y = 235, - eCSSProperty_scroll_snap_type_x = 236, - eCSSProperty_scroll_snap_type_y = 237, - eCSSProperty_shape_rendering = 238, - eCSSProperty__x_span = 239, - eCSSProperty_stack_sizing = 240, - eCSSProperty_stop_color = 241, - eCSSProperty_stop_opacity = 242, - eCSSProperty_stroke = 243, - eCSSProperty_stroke_dasharray = 244, - eCSSProperty_stroke_dashoffset = 245, - eCSSProperty_stroke_linecap = 246, - eCSSProperty_stroke_linejoin = 247, - eCSSProperty_stroke_miterlimit = 248, - eCSSProperty_stroke_opacity = 249, - eCSSProperty_stroke_width = 250, - eCSSProperty__x_system_font = 251, - eCSSProperty__moz_tab_size = 252, - eCSSProperty_table_layout = 253, - eCSSProperty_text_align = 254, - eCSSProperty_text_align_last = 255, - eCSSProperty_text_anchor = 256, - eCSSProperty_text_combine_upright = 257, - eCSSProperty_text_decoration_color = 258, - eCSSProperty_text_decoration_line = 259, - eCSSProperty_text_decoration_style = 260, - eCSSProperty_text_emphasis_color = 261, - eCSSProperty_text_emphasis_position = 262, - eCSSProperty_text_emphasis_style = 263, - eCSSProperty__webkit_text_fill_color = 264, - eCSSProperty_text_indent = 265, - eCSSProperty_text_orientation = 266, - eCSSProperty_text_overflow = 267, - eCSSProperty_text_rendering = 268, - eCSSProperty_text_shadow = 269, - eCSSProperty_text_size_adjust = 270, - eCSSProperty__webkit_text_stroke_color = 271, - eCSSProperty__webkit_text_stroke_width = 272, - eCSSProperty_text_transform = 273, - eCSSProperty__x_text_zoom = 274, - eCSSProperty_top = 275, - eCSSProperty__moz_top_layer = 276, - eCSSProperty_touch_action = 277, - eCSSProperty_transform = 278, - eCSSProperty_transform_box = 279, - eCSSProperty_transform_origin = 280, - eCSSProperty_transform_style = 281, - eCSSProperty_transition_delay = 282, - eCSSProperty_transition_duration = 283, - eCSSProperty_transition_property = 284, - eCSSProperty_transition_timing_function = 285, - eCSSProperty_unicode_bidi = 286, - eCSSProperty_user_focus = 287, - eCSSProperty_user_input = 288, - eCSSProperty_user_modify = 289, - eCSSProperty_user_select = 290, - eCSSProperty_vector_effect = 291, - eCSSProperty_vertical_align = 292, - eCSSProperty_visibility = 293, - eCSSProperty_white_space = 294, - eCSSProperty_width = 295, - eCSSProperty_will_change = 296, - eCSSProperty__moz_window_dragging = 297, - eCSSProperty__moz_window_shadow = 298, - eCSSProperty_word_break = 299, - eCSSProperty_word_spacing = 300, - eCSSProperty_word_wrap = 301, - eCSSProperty_writing_mode = 302, - eCSSProperty_z_index = 303, - eCSSProperty_COUNT_no_shorthands = 304, - eCSSProperty_animation = 305, - eCSSProperty_background = 306, - eCSSProperty_border = 307, - eCSSProperty_border_block_end = 308, - eCSSProperty_border_block_start = 309, - eCSSProperty_border_bottom = 310, - eCSSProperty_border_color = 311, - eCSSProperty_border_image = 312, - eCSSProperty_border_inline_end = 313, - eCSSProperty_border_inline_start = 314, - eCSSProperty_border_left = 315, - eCSSProperty_border_radius = 316, - eCSSProperty_border_right = 317, - eCSSProperty_border_style = 318, - eCSSProperty_border_top = 319, - eCSSProperty_border_width = 320, - eCSSProperty__moz_column_rule = 321, - eCSSProperty__moz_columns = 322, - eCSSProperty_flex = 323, - eCSSProperty_flex_flow = 324, - eCSSProperty_font = 325, - eCSSProperty_font_variant = 326, - eCSSProperty_grid = 327, - eCSSProperty_grid_area = 328, - eCSSProperty_grid_column = 329, - eCSSProperty_grid_gap = 330, - eCSSProperty_grid_row = 331, - eCSSProperty_grid_template = 332, - eCSSProperty_list_style = 333, - eCSSProperty_margin = 334, - eCSSProperty_marker = 335, - eCSSProperty_outline = 336, - eCSSProperty__moz_outline_radius = 337, - eCSSProperty_overflow = 338, - eCSSProperty_padding = 339, - eCSSProperty_scroll_snap_type = 340, - eCSSProperty_text_decoration = 341, - eCSSProperty_text_emphasis = 342, - eCSSProperty__webkit_text_stroke = 343, - eCSSProperty__moz_transform = 344, - eCSSProperty_transition = 345, - eCSSProperty_COUNT = 346, - eCSSPropertyAlias_MozPerspectiveOrigin = 347, - eCSSPropertyAlias_MozPerspective = 348, - eCSSPropertyAlias_MozTransformStyle = 349, - eCSSPropertyAlias_MozBackfaceVisibility = 350, - eCSSPropertyAlias_MozBorderImage = 351, - eCSSPropertyAlias_MozTransition = 352, - eCSSPropertyAlias_MozTransitionDelay = 353, - eCSSPropertyAlias_MozTransitionDuration = 354, - eCSSPropertyAlias_MozTransitionProperty = 355, - eCSSPropertyAlias_MozTransitionTimingFunction = 356, - eCSSPropertyAlias_MozAnimation = 357, - eCSSPropertyAlias_MozAnimationDelay = 358, - eCSSPropertyAlias_MozAnimationDirection = 359, - eCSSPropertyAlias_MozAnimationDuration = 360, - eCSSPropertyAlias_MozAnimationFillMode = 361, - eCSSPropertyAlias_MozAnimationIterationCount = 362, - eCSSPropertyAlias_MozAnimationName = 363, - eCSSPropertyAlias_MozAnimationPlayState = 364, - eCSSPropertyAlias_MozAnimationTimingFunction = 365, - eCSSPropertyAlias_MozBoxSizing = 366, - eCSSPropertyAlias_MozFontFeatureSettings = 367, - eCSSPropertyAlias_MozFontLanguageOverride = 368, - eCSSPropertyAlias_MozPaddingEnd = 369, - eCSSPropertyAlias_MozPaddingStart = 370, - eCSSPropertyAlias_MozMarginEnd = 371, - eCSSPropertyAlias_MozMarginStart = 372, - eCSSPropertyAlias_MozBorderEnd = 373, - eCSSPropertyAlias_MozBorderEndColor = 374, - eCSSPropertyAlias_MozBorderEndStyle = 375, - eCSSPropertyAlias_MozBorderEndWidth = 376, - eCSSPropertyAlias_MozBorderStart = 377, - eCSSPropertyAlias_MozBorderStartColor = 378, - eCSSPropertyAlias_MozBorderStartStyle = 379, - eCSSPropertyAlias_MozBorderStartWidth = 380, - eCSSPropertyAlias_MozHyphens = 381, - eCSSPropertyAlias_WebkitAnimation = 382, - eCSSPropertyAlias_WebkitAnimationDelay = 383, - eCSSPropertyAlias_WebkitAnimationDirection = 384, - eCSSPropertyAlias_WebkitAnimationDuration = 385, - eCSSPropertyAlias_WebkitAnimationFillMode = 386, - eCSSPropertyAlias_WebkitAnimationIterationCount = 387, - eCSSPropertyAlias_WebkitAnimationName = 388, - eCSSPropertyAlias_WebkitAnimationPlayState = 389, - eCSSPropertyAlias_WebkitAnimationTimingFunction = 390, - eCSSPropertyAlias_WebkitFilter = 391, - eCSSPropertyAlias_WebkitTextSizeAdjust = 392, - eCSSPropertyAlias_WebkitTransform = 393, - eCSSPropertyAlias_WebkitTransformOrigin = 394, - eCSSPropertyAlias_WebkitTransformStyle = 395, - eCSSPropertyAlias_WebkitBackfaceVisibility = 396, - eCSSPropertyAlias_WebkitPerspective = 397, - eCSSPropertyAlias_WebkitPerspectiveOrigin = 398, - eCSSPropertyAlias_WebkitTransition = 399, - eCSSPropertyAlias_WebkitTransitionDelay = 400, - eCSSPropertyAlias_WebkitTransitionDuration = 401, - eCSSPropertyAlias_WebkitTransitionProperty = 402, - eCSSPropertyAlias_WebkitTransitionTimingFunction = 403, - eCSSPropertyAlias_WebkitBorderRadius = 404, - eCSSPropertyAlias_WebkitBorderTopLeftRadius = 405, - eCSSPropertyAlias_WebkitBorderTopRightRadius = 406, - eCSSPropertyAlias_WebkitBorderBottomLeftRadius = 407, - eCSSPropertyAlias_WebkitBorderBottomRightRadius = 408, - eCSSPropertyAlias_WebkitBackgroundClip = 409, - eCSSPropertyAlias_WebkitBackgroundOrigin = 410, - eCSSPropertyAlias_WebkitBackgroundSize = 411, - eCSSPropertyAlias_WebkitBorderImage = 412, - eCSSPropertyAlias_WebkitBoxShadow = 413, - eCSSPropertyAlias_WebkitBoxSizing = 414, - eCSSPropertyAlias_WebkitBoxFlex = 415, - eCSSPropertyAlias_WebkitBoxOrdinalGroup = 416, - eCSSPropertyAlias_WebkitBoxOrient = 417, - eCSSPropertyAlias_WebkitBoxDirection = 418, - eCSSPropertyAlias_WebkitBoxAlign = 419, - eCSSPropertyAlias_WebkitBoxPack = 420, - eCSSPropertyAlias_WebkitUserSelect = 421, - eCSSProperty_COUNT_with_aliases = 422, - eCSSPropertyExtra_all_properties = 423, - eCSSPropertyExtra_x_none_value = 424, - eCSSPropertyExtra_x_auto_value = 425, - eCSSPropertyExtra_variable = 426, + eCSSProperty_background_position_x = 19, + eCSSProperty_background_position_y = 20, + eCSSProperty_background_repeat = 21, + eCSSProperty_background_size = 22, + eCSSProperty_binding = 23, + eCSSProperty_block_size = 24, + eCSSProperty_border_block_end_color = 25, + eCSSProperty_border_block_end_style = 26, + eCSSProperty_border_block_end_width = 27, + eCSSProperty_border_block_start_color = 28, + eCSSProperty_border_block_start_style = 29, + eCSSProperty_border_block_start_width = 30, + eCSSProperty_border_bottom_color = 31, + eCSSProperty_border_bottom_colors = 32, + eCSSProperty_border_bottom_left_radius = 33, + eCSSProperty_border_bottom_right_radius = 34, + eCSSProperty_border_bottom_style = 35, + eCSSProperty_border_bottom_width = 36, + eCSSProperty_border_collapse = 37, + eCSSProperty_border_image_outset = 38, + eCSSProperty_border_image_repeat = 39, + eCSSProperty_border_image_slice = 40, + eCSSProperty_border_image_source = 41, + eCSSProperty_border_image_width = 42, + eCSSProperty_border_inline_end_color = 43, + eCSSProperty_border_inline_end_style = 44, + eCSSProperty_border_inline_end_width = 45, + eCSSProperty_border_inline_start_color = 46, + eCSSProperty_border_inline_start_style = 47, + eCSSProperty_border_inline_start_width = 48, + eCSSProperty_border_left_color = 49, + eCSSProperty_border_left_colors = 50, + eCSSProperty_border_left_style = 51, + eCSSProperty_border_left_width = 52, + eCSSProperty_border_right_color = 53, + eCSSProperty_border_right_colors = 54, + eCSSProperty_border_right_style = 55, + eCSSProperty_border_right_width = 56, + eCSSProperty_border_spacing = 57, + eCSSProperty_border_top_color = 58, + eCSSProperty_border_top_colors = 59, + eCSSProperty_border_top_left_radius = 60, + eCSSProperty_border_top_right_radius = 61, + eCSSProperty_border_top_style = 62, + eCSSProperty_border_top_width = 63, + eCSSProperty_bottom = 64, + eCSSProperty_box_align = 65, + eCSSProperty_box_decoration_break = 66, + eCSSProperty_box_direction = 67, + eCSSProperty_box_flex = 68, + eCSSProperty_box_ordinal_group = 69, + eCSSProperty_box_orient = 70, + eCSSProperty_box_pack = 71, + eCSSProperty_box_shadow = 72, + eCSSProperty_box_sizing = 73, + eCSSProperty_caption_side = 74, + eCSSProperty_clear = 75, + eCSSProperty_clip = 76, + eCSSProperty_clip_path = 77, + eCSSProperty_clip_rule = 78, + eCSSProperty_color = 79, + eCSSProperty_color_adjust = 80, + eCSSProperty_color_interpolation = 81, + eCSSProperty_color_interpolation_filters = 82, + eCSSProperty__moz_column_count = 83, + eCSSProperty__moz_column_fill = 84, + eCSSProperty__moz_column_gap = 85, + eCSSProperty__moz_column_rule_color = 86, + eCSSProperty__moz_column_rule_style = 87, + eCSSProperty__moz_column_rule_width = 88, + eCSSProperty__moz_column_width = 89, + eCSSProperty_contain = 90, + eCSSProperty_content = 91, + eCSSProperty__moz_control_character_visibility = 92, + eCSSProperty_counter_increment = 93, + eCSSProperty_counter_reset = 94, + eCSSProperty_cursor = 95, + eCSSProperty_direction = 96, + eCSSProperty_display = 97, + eCSSProperty_dominant_baseline = 98, + eCSSProperty_empty_cells = 99, + eCSSProperty_fill = 100, + eCSSProperty_fill_opacity = 101, + eCSSProperty_fill_rule = 102, + eCSSProperty_filter = 103, + eCSSProperty_flex_basis = 104, + eCSSProperty_flex_direction = 105, + eCSSProperty_flex_grow = 106, + eCSSProperty_flex_shrink = 107, + eCSSProperty_flex_wrap = 108, + eCSSProperty_float = 109, + eCSSProperty_float_edge = 110, + eCSSProperty_flood_color = 111, + eCSSProperty_flood_opacity = 112, + eCSSProperty_font_family = 113, + eCSSProperty_font_feature_settings = 114, + eCSSProperty_font_kerning = 115, + eCSSProperty_font_language_override = 116, + eCSSProperty_font_size = 117, + eCSSProperty_font_size_adjust = 118, + eCSSProperty_font_stretch = 119, + eCSSProperty_font_style = 120, + eCSSProperty_font_synthesis = 121, + eCSSProperty_font_variant_alternates = 122, + eCSSProperty_font_variant_caps = 123, + eCSSProperty_font_variant_east_asian = 124, + eCSSProperty_font_variant_ligatures = 125, + eCSSProperty_font_variant_numeric = 126, + eCSSProperty_font_variant_position = 127, + eCSSProperty_font_weight = 128, + eCSSProperty_force_broken_image_icon = 129, + eCSSProperty_grid_auto_columns = 130, + eCSSProperty_grid_auto_flow = 131, + eCSSProperty_grid_auto_rows = 132, + eCSSProperty_grid_column_end = 133, + eCSSProperty_grid_column_gap = 134, + eCSSProperty_grid_column_start = 135, + eCSSProperty_grid_row_end = 136, + eCSSProperty_grid_row_gap = 137, + eCSSProperty_grid_row_start = 138, + eCSSProperty_grid_template_areas = 139, + eCSSProperty_grid_template_columns = 140, + eCSSProperty_grid_template_rows = 141, + eCSSProperty_height = 142, + eCSSProperty_hyphens = 143, + eCSSProperty_image_orientation = 144, + eCSSProperty_image_region = 145, + eCSSProperty_image_rendering = 146, + eCSSProperty_ime_mode = 147, + eCSSProperty_inline_size = 148, + eCSSProperty_isolation = 149, + eCSSProperty_justify_content = 150, + eCSSProperty_justify_items = 151, + eCSSProperty_justify_self = 152, + eCSSProperty__x_lang = 153, + eCSSProperty_left = 154, + eCSSProperty_letter_spacing = 155, + eCSSProperty_lighting_color = 156, + eCSSProperty_line_height = 157, + eCSSProperty_list_style_image = 158, + eCSSProperty_list_style_position = 159, + eCSSProperty_list_style_type = 160, + eCSSProperty_margin_block_end = 161, + eCSSProperty_margin_block_start = 162, + eCSSProperty_margin_bottom = 163, + eCSSProperty_margin_inline_end = 164, + eCSSProperty_margin_inline_start = 165, + eCSSProperty_margin_left = 166, + eCSSProperty_margin_right = 167, + eCSSProperty_margin_top = 168, + eCSSProperty_marker_end = 169, + eCSSProperty_marker_mid = 170, + eCSSProperty_marker_offset = 171, + eCSSProperty_marker_start = 172, + eCSSProperty_mask = 173, + eCSSProperty_mask_type = 174, + eCSSProperty_math_display = 175, + eCSSProperty_math_variant = 176, + eCSSProperty_max_block_size = 177, + eCSSProperty_max_height = 178, + eCSSProperty_max_inline_size = 179, + eCSSProperty_max_width = 180, + eCSSProperty_min_block_size = 181, + eCSSProperty__moz_min_font_size_ratio = 182, + eCSSProperty_min_height = 183, + eCSSProperty_min_inline_size = 184, + eCSSProperty_min_width = 185, + eCSSProperty_mix_blend_mode = 186, + eCSSProperty_object_fit = 187, + eCSSProperty_object_position = 188, + eCSSProperty_offset_block_end = 189, + eCSSProperty_offset_block_start = 190, + eCSSProperty_offset_inline_end = 191, + eCSSProperty_offset_inline_start = 192, + eCSSProperty_opacity = 193, + eCSSProperty_order = 194, + eCSSProperty_orient = 195, + eCSSProperty_osx_font_smoothing = 196, + eCSSProperty_outline_color = 197, + eCSSProperty_outline_offset = 198, + eCSSProperty__moz_outline_radius_bottomLeft = 199, + eCSSProperty__moz_outline_radius_bottomRight = 200, + eCSSProperty__moz_outline_radius_topLeft = 201, + eCSSProperty__moz_outline_radius_topRight = 202, + eCSSProperty_outline_style = 203, + eCSSProperty_outline_width = 204, + eCSSProperty_overflow_clip_box = 205, + eCSSProperty_overflow_x = 206, + eCSSProperty_overflow_y = 207, + eCSSProperty_padding_block_end = 208, + eCSSProperty_padding_block_start = 209, + eCSSProperty_padding_bottom = 210, + eCSSProperty_padding_inline_end = 211, + eCSSProperty_padding_inline_start = 212, + eCSSProperty_padding_left = 213, + eCSSProperty_padding_right = 214, + eCSSProperty_padding_top = 215, + eCSSProperty_page_break_after = 216, + eCSSProperty_page_break_before = 217, + eCSSProperty_page_break_inside = 218, + eCSSProperty_paint_order = 219, + eCSSProperty_perspective = 220, + eCSSProperty_perspective_origin = 221, + eCSSProperty_pointer_events = 222, + eCSSProperty_position = 223, + eCSSProperty_quotes = 224, + eCSSProperty_resize = 225, + eCSSProperty_right = 226, + eCSSProperty_ruby_align = 227, + eCSSProperty_ruby_position = 228, + eCSSProperty_script_level = 229, + eCSSProperty_script_min_size = 230, + eCSSProperty_script_size_multiplier = 231, + eCSSProperty_scroll_behavior = 232, + eCSSProperty_scroll_snap_coordinate = 233, + eCSSProperty_scroll_snap_destination = 234, + eCSSProperty_scroll_snap_points_x = 235, + eCSSProperty_scroll_snap_points_y = 236, + eCSSProperty_scroll_snap_type_x = 237, + eCSSProperty_scroll_snap_type_y = 238, + eCSSProperty_shape_rendering = 239, + eCSSProperty__x_span = 240, + eCSSProperty_stack_sizing = 241, + eCSSProperty_stop_color = 242, + eCSSProperty_stop_opacity = 243, + eCSSProperty_stroke = 244, + eCSSProperty_stroke_dasharray = 245, + eCSSProperty_stroke_dashoffset = 246, + eCSSProperty_stroke_linecap = 247, + eCSSProperty_stroke_linejoin = 248, + eCSSProperty_stroke_miterlimit = 249, + eCSSProperty_stroke_opacity = 250, + eCSSProperty_stroke_width = 251, + eCSSProperty__x_system_font = 252, + eCSSProperty__moz_tab_size = 253, + eCSSProperty_table_layout = 254, + eCSSProperty_text_align = 255, + eCSSProperty_text_align_last = 256, + eCSSProperty_text_anchor = 257, + eCSSProperty_text_combine_upright = 258, + eCSSProperty_text_decoration_color = 259, + eCSSProperty_text_decoration_line = 260, + eCSSProperty_text_decoration_style = 261, + eCSSProperty_text_emphasis_color = 262, + eCSSProperty_text_emphasis_position = 263, + eCSSProperty_text_emphasis_style = 264, + eCSSProperty__webkit_text_fill_color = 265, + eCSSProperty_text_indent = 266, + eCSSProperty_text_orientation = 267, + eCSSProperty_text_overflow = 268, + eCSSProperty_text_rendering = 269, + eCSSProperty_text_shadow = 270, + eCSSProperty_text_size_adjust = 271, + eCSSProperty__webkit_text_stroke_color = 272, + eCSSProperty__webkit_text_stroke_width = 273, + eCSSProperty_text_transform = 274, + eCSSProperty__x_text_zoom = 275, + eCSSProperty_top = 276, + eCSSProperty__moz_top_layer = 277, + eCSSProperty_touch_action = 278, + eCSSProperty_transform = 279, + eCSSProperty_transform_box = 280, + eCSSProperty_transform_origin = 281, + eCSSProperty_transform_style = 282, + eCSSProperty_transition_delay = 283, + eCSSProperty_transition_duration = 284, + eCSSProperty_transition_property = 285, + eCSSProperty_transition_timing_function = 286, + eCSSProperty_unicode_bidi = 287, + eCSSProperty_user_focus = 288, + eCSSProperty_user_input = 289, + eCSSProperty_user_modify = 290, + eCSSProperty_user_select = 291, + eCSSProperty_vector_effect = 292, + eCSSProperty_vertical_align = 293, + eCSSProperty_visibility = 294, + eCSSProperty_white_space = 295, + eCSSProperty_width = 296, + eCSSProperty_will_change = 297, + eCSSProperty__moz_window_dragging = 298, + eCSSProperty__moz_window_shadow = 299, + eCSSProperty_word_break = 300, + eCSSProperty_word_spacing = 301, + eCSSProperty_word_wrap = 302, + eCSSProperty_writing_mode = 303, + eCSSProperty_z_index = 304, + eCSSProperty_COUNT_no_shorthands = 305, + eCSSProperty_animation = 306, + eCSSProperty_background = 307, + eCSSProperty_background_position = 308, + eCSSProperty_border = 309, + eCSSProperty_border_block_end = 310, + eCSSProperty_border_block_start = 311, + eCSSProperty_border_bottom = 312, + eCSSProperty_border_color = 313, + eCSSProperty_border_image = 314, + eCSSProperty_border_inline_end = 315, + eCSSProperty_border_inline_start = 316, + eCSSProperty_border_left = 317, + eCSSProperty_border_radius = 318, + eCSSProperty_border_right = 319, + eCSSProperty_border_style = 320, + eCSSProperty_border_top = 321, + eCSSProperty_border_width = 322, + eCSSProperty__moz_column_rule = 323, + eCSSProperty__moz_columns = 324, + eCSSProperty_flex = 325, + eCSSProperty_flex_flow = 326, + eCSSProperty_font = 327, + eCSSProperty_font_variant = 328, + eCSSProperty_grid = 329, + eCSSProperty_grid_area = 330, + eCSSProperty_grid_column = 331, + eCSSProperty_grid_gap = 332, + eCSSProperty_grid_row = 333, + eCSSProperty_grid_template = 334, + eCSSProperty_list_style = 335, + eCSSProperty_margin = 336, + eCSSProperty_marker = 337, + eCSSProperty_outline = 338, + eCSSProperty__moz_outline_radius = 339, + eCSSProperty_overflow = 340, + eCSSProperty_padding = 341, + eCSSProperty_scroll_snap_type = 342, + eCSSProperty_text_decoration = 343, + eCSSProperty_text_emphasis = 344, + eCSSProperty__webkit_text_stroke = 345, + eCSSProperty__moz_transform = 346, + eCSSProperty_transition = 347, + eCSSProperty_COUNT = 348, + eCSSPropertyAlias_MozPerspectiveOrigin = 349, + eCSSPropertyAlias_MozPerspective = 350, + eCSSPropertyAlias_MozTransformStyle = 351, + eCSSPropertyAlias_MozBackfaceVisibility = 352, + eCSSPropertyAlias_MozBorderImage = 353, + eCSSPropertyAlias_MozTransition = 354, + eCSSPropertyAlias_MozTransitionDelay = 355, + eCSSPropertyAlias_MozTransitionDuration = 356, + eCSSPropertyAlias_MozTransitionProperty = 357, + eCSSPropertyAlias_MozTransitionTimingFunction = 358, + eCSSPropertyAlias_MozAnimation = 359, + eCSSPropertyAlias_MozAnimationDelay = 360, + eCSSPropertyAlias_MozAnimationDirection = 361, + eCSSPropertyAlias_MozAnimationDuration = 362, + eCSSPropertyAlias_MozAnimationFillMode = 363, + eCSSPropertyAlias_MozAnimationIterationCount = 364, + eCSSPropertyAlias_MozAnimationName = 365, + eCSSPropertyAlias_MozAnimationPlayState = 366, + eCSSPropertyAlias_MozAnimationTimingFunction = 367, + eCSSPropertyAlias_MozBoxSizing = 368, + eCSSPropertyAlias_MozFontFeatureSettings = 369, + eCSSPropertyAlias_MozFontLanguageOverride = 370, + eCSSPropertyAlias_MozPaddingEnd = 371, + eCSSPropertyAlias_MozPaddingStart = 372, + eCSSPropertyAlias_MozMarginEnd = 373, + eCSSPropertyAlias_MozMarginStart = 374, + eCSSPropertyAlias_MozBorderEnd = 375, + eCSSPropertyAlias_MozBorderEndColor = 376, + eCSSPropertyAlias_MozBorderEndStyle = 377, + eCSSPropertyAlias_MozBorderEndWidth = 378, + eCSSPropertyAlias_MozBorderStart = 379, + eCSSPropertyAlias_MozBorderStartColor = 380, + eCSSPropertyAlias_MozBorderStartStyle = 381, + eCSSPropertyAlias_MozBorderStartWidth = 382, + eCSSPropertyAlias_MozHyphens = 383, + eCSSPropertyAlias_WebkitAnimation = 384, + eCSSPropertyAlias_WebkitAnimationDelay = 385, + eCSSPropertyAlias_WebkitAnimationDirection = 386, + eCSSPropertyAlias_WebkitAnimationDuration = 387, + eCSSPropertyAlias_WebkitAnimationFillMode = 388, + eCSSPropertyAlias_WebkitAnimationIterationCount = 389, + eCSSPropertyAlias_WebkitAnimationName = 390, + eCSSPropertyAlias_WebkitAnimationPlayState = 391, + eCSSPropertyAlias_WebkitAnimationTimingFunction = 392, + eCSSPropertyAlias_WebkitFilter = 393, + eCSSPropertyAlias_WebkitTextSizeAdjust = 394, + eCSSPropertyAlias_WebkitTransform = 395, + eCSSPropertyAlias_WebkitTransformOrigin = 396, + eCSSPropertyAlias_WebkitTransformStyle = 397, + eCSSPropertyAlias_WebkitBackfaceVisibility = 398, + eCSSPropertyAlias_WebkitPerspective = 399, + eCSSPropertyAlias_WebkitPerspectiveOrigin = 400, + eCSSPropertyAlias_WebkitTransition = 401, + eCSSPropertyAlias_WebkitTransitionDelay = 402, + eCSSPropertyAlias_WebkitTransitionDuration = 403, + eCSSPropertyAlias_WebkitTransitionProperty = 404, + eCSSPropertyAlias_WebkitTransitionTimingFunction = 405, + eCSSPropertyAlias_WebkitBorderRadius = 406, + eCSSPropertyAlias_WebkitBorderTopLeftRadius = 407, + eCSSPropertyAlias_WebkitBorderTopRightRadius = 408, + eCSSPropertyAlias_WebkitBorderBottomLeftRadius = 409, + eCSSPropertyAlias_WebkitBorderBottomRightRadius = 410, + eCSSPropertyAlias_WebkitBackgroundClip = 411, + eCSSPropertyAlias_WebkitBackgroundOrigin = 412, + eCSSPropertyAlias_WebkitBackgroundSize = 413, + eCSSPropertyAlias_WebkitBorderImage = 414, + eCSSPropertyAlias_WebkitBoxShadow = 415, + eCSSPropertyAlias_WebkitBoxSizing = 416, + eCSSPropertyAlias_WebkitBoxFlex = 417, + eCSSPropertyAlias_WebkitBoxOrdinalGroup = 418, + eCSSPropertyAlias_WebkitBoxOrient = 419, + eCSSPropertyAlias_WebkitBoxDirection = 420, + eCSSPropertyAlias_WebkitBoxAlign = 421, + eCSSPropertyAlias_WebkitBoxPack = 422, + eCSSPropertyAlias_WebkitUserSelect = 423, + eCSSProperty_COUNT_with_aliases = 424, + eCSSPropertyExtra_all_properties = 425, + eCSSPropertyExtra_x_none_value = 426, + eCSSPropertyExtra_x_auto_value = 427, + eCSSPropertyExtra_variable = 428, } #[repr(i32)] #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] @@ -3558,9 +3594,10 @@ fn bindgen_test_layout_GridNamedArea() { assert_eq!(::std::mem::align_of::<GridNamedArea>() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct GridTemplateAreasValue { - pub mNamedAreas: u64, - pub mTemplates: u64, + pub mNamedAreas: nsTArray<GridNamedArea>, + pub mTemplates: nsTArray<nsString>, pub mNColumns: u32, pub mRefCnt: nsAutoRefCnt, pub _mOwningThread: nsAutoOwningThread, @@ -3571,6 +3608,7 @@ fn bindgen_test_layout_GridTemplateAreasValue() { assert_eq!(::std::mem::align_of::<GridTemplateAreasValue>() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct FontFamilyListRefCnt { pub _base: FontFamilyList, pub mRefCnt: nsAutoRefCnt, @@ -3872,6 +3910,7 @@ fn bindgen_test_layout_nsCSSValueGradientStop() { assert_eq!(::std::mem::align_of::<nsCSSValueGradientStop>() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValueGradient { pub mIsRadial: bool, pub mIsRepeating: bool, @@ -3880,7 +3919,7 @@ pub struct nsCSSValueGradient { pub mBgPos: nsCSSValuePair, pub mAngle: nsCSSValue, pub mRadialValues: [nsCSSValue; 2usize], - pub mStops: u64, + pub mStops: nsTArray<nsCSSValueGradientStop>, pub mRefCnt: nsAutoRefCnt, pub _mOwningThread: nsAutoOwningThread, } @@ -3959,13 +3998,14 @@ fn bindgen_test_layout_CounterStyle() { assert_eq!(::std::mem::align_of::<CounterStyle>() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct AnonymousCounterStyle { pub _base: CounterStyle, pub mRefCnt: nsAutoRefCnt, pub _mOwningThread: nsAutoOwningThread, pub mSingleString: bool, pub mSystem: u8, - pub mSymbols: u64, + pub mSymbols: nsTArray<nsString>, } #[repr(C)] pub struct _vftable_AnonymousCounterStyle { @@ -4340,6 +4380,7 @@ fn bindgen_test_layout_nsStyleGradientStop() { assert_eq!(::std::mem::align_of::<nsStyleGradientStop>() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleGradient { pub mShape: u8, pub mSize: u8, @@ -4350,7 +4391,7 @@ pub struct nsStyleGradient { pub mAngle: nsStyleCoord, pub mRadiusX: nsStyleCoord, pub mRadiusY: nsStyleCoord, - pub mStops: u64, + pub mStops: nsTArray<nsStyleGradientStop>, pub mRefCnt: nsAutoRefCnt, pub _mOwningThread: nsAutoOwningThread, } @@ -4419,21 +4460,35 @@ fn bindgen_test_layout_nsStyleColor() { assert_eq!(::std::mem::size_of::<nsStyleColor>() , 4usize); assert_eq!(::std::mem::align_of::<nsStyleColor>() , 4usize); } +/** + * An array of objects, similar to AutoTArray<T,1> but which is memmovable. It + * always has length >= 1. + */ #[repr(C)] -pub struct nsStyleAutoArray; +#[derive(Debug)] +pub struct nsStyleAutoArray<T> { + pub mFirstElement: T, + pub mOtherElements: nsTArray<T>, +} +#[repr(i32)] +#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] +pub enum nsStyleAutoArray_WithSingleInitialElement { + WITH_SINGLE_INITIAL_ELEMENT = 0, +} #[repr(C)] pub struct nsStyleImageLayers { pub mAttachmentCount: u32, pub mClipCount: u32, pub mOriginCount: u32, pub mRepeatCount: u32, - pub mPositionCount: u32, + pub mPositionXCount: u32, + pub mPositionYCount: u32, pub mImageCount: u32, pub mSizeCount: u32, pub mMaskModeCount: u32, pub mBlendModeCount: u32, pub mCompositeCount: u32, - pub mLayers: [u64; 15usize], + pub mLayers: nsStyleAutoArray<nsStyleImageLayers_Layer>, } #[repr(u32)] #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] @@ -4442,13 +4497,14 @@ pub enum nsStyleImageLayers_nsStyleStruct_h_unnamed_14 { color = 1, image = 2, repeat = 3, - position = 4, - clip = 5, - origin = 6, - size = 7, - attachment = 8, - maskMode = 9, - composite = 10, + positionX = 4, + positionY = 5, + clip = 6, + origin = 7, + size = 8, + attachment = 9, + maskMode = 10, + composite = 11, } #[repr(C)] #[derive(Debug, Copy)] @@ -4541,7 +4597,7 @@ fn bindgen_test_layout_nsStyleImageLayers_Layer() { } #[test] fn bindgen_test_layout_nsStyleImageLayers() { - assert_eq!(::std::mem::size_of::<nsStyleImageLayers>() , 160usize); + assert_eq!(::std::mem::size_of::<nsStyleImageLayers>() , 168usize); assert_eq!(::std::mem::align_of::<nsStyleImageLayers>() , 8usize); } #[repr(C)] @@ -4551,31 +4607,27 @@ pub struct nsStyleBackground { } #[test] fn bindgen_test_layout_nsStyleBackground() { - assert_eq!(::std::mem::size_of::<nsStyleBackground>() , 168usize); + assert_eq!(::std::mem::size_of::<nsStyleBackground>() , 176usize); assert_eq!(::std::mem::align_of::<nsStyleBackground>() , 8usize); } #[repr(C)] #[derive(Debug)] pub struct nsStyleMargin { pub mMargin: nsStyleSides, - pub mHasCachedMargin: bool, - pub mCachedMargin: nsMargin, } #[test] fn bindgen_test_layout_nsStyleMargin() { - assert_eq!(::std::mem::size_of::<nsStyleMargin>() , 64usize); + assert_eq!(::std::mem::size_of::<nsStyleMargin>() , 40usize); assert_eq!(::std::mem::align_of::<nsStyleMargin>() , 8usize); } #[repr(C)] #[derive(Debug)] pub struct nsStylePadding { pub mPadding: nsStyleSides, - pub mHasCachedPadding: bool, - pub mCachedPadding: nsMargin, } #[test] fn bindgen_test_layout_nsStylePadding() { - assert_eq!(::std::mem::size_of::<nsStylePadding>() , 64usize); + assert_eq!(::std::mem::size_of::<nsStylePadding>() , 40usize); assert_eq!(::std::mem::align_of::<nsStylePadding>() , 8usize); } #[repr(C)] @@ -4664,10 +4716,11 @@ fn bindgen_test_layout_nsStyleOutline() { * to share the same 'quotes' value with a parent style context. */ #[repr(C)] +#[derive(Debug)] pub struct nsStyleQuoteValues { pub mRefCnt: nsAutoRefCnt, pub _mOwningThread: nsAutoOwningThread, - pub mQuotePairs: u64, + pub mQuotePairs: nsTArray<pair<nsString, nsString>>, } #[test] fn bindgen_test_layout_nsStyleQuoteValues() { @@ -4677,7 +4730,6 @@ fn bindgen_test_layout_nsStyleQuoteValues() { #[repr(C)] pub struct nsStyleList { pub mListStylePosition: u8, - pub mListStyleType: nsString, pub mCounterStyle: RefPtr<CounterStyle>, pub mListStyleImage: RefPtr<imgRequestProxy>, pub mQuotes: RefPtr<nsStyleQuoteValues>, @@ -4685,7 +4737,7 @@ pub struct nsStyleList { } #[test] fn bindgen_test_layout_nsStyleList() { - assert_eq!(::std::mem::size_of::<nsStyleList>() , 64usize); + assert_eq!(::std::mem::size_of::<nsStyleList>() , 48usize); assert_eq!(::std::mem::align_of::<nsStyleList>() , 8usize); } #[repr(C)] @@ -4701,12 +4753,13 @@ fn bindgen_test_layout_nsStyleGridLine() { assert_eq!(::std::mem::align_of::<nsStyleGridLine>() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleGridTemplate { - pub mLineNameLists: u64, - pub mMinTrackSizingFunctions: u64, - pub mMaxTrackSizingFunctions: u64, - pub mRepeatAutoLineNameListBefore: u64, - pub mRepeatAutoLineNameListAfter: u64, + pub mLineNameLists: nsTArray<nsTArray<nsString>>, + pub mMinTrackSizingFunctions: nsTArray<nsStyleCoord>, + pub mMaxTrackSizingFunctions: nsTArray<nsStyleCoord>, + pub mRepeatAutoLineNameListBefore: nsTArray<nsString>, + pub mRepeatAutoLineNameListAfter: nsTArray<nsString>, pub mRepeatAutoIndex: i16, pub _bitfield_1: u8, } @@ -4716,6 +4769,7 @@ fn bindgen_test_layout_nsStyleGridTemplate() { assert_eq!(::std::mem::align_of::<nsStyleGridTemplate>() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStylePosition { pub mObjectPosition: nsStyleImageLayers_Position, pub mOffset: nsStyleSides, @@ -5021,7 +5075,7 @@ pub struct nsStyleDisplay { pub mIsolation: u8, pub mTopLayer: u8, pub mWillChangeBitField: u8, - pub mWillChange: u64, + pub mWillChange: nsTArray<nsString>, pub mTouchAction: u8, pub mScrollBehavior: u8, pub mScrollSnapTypeX: u8, @@ -5029,7 +5083,7 @@ pub struct nsStyleDisplay { pub mScrollSnapPointsX: nsStyleCoord, pub mScrollSnapPointsY: nsStyleCoord, pub mScrollSnapDestination: nsStyleImageLayers_Position, - pub mScrollSnapCoordinate: u64, + pub mScrollSnapCoordinate: nsTArray<nsStyleImageLayers_Position>, pub mBackfaceVisibility: u8, pub mTransformStyle: u8, pub mTransformBox: u8, @@ -5038,12 +5092,12 @@ pub struct nsStyleDisplay { pub mChildPerspective: nsStyleCoord, pub mPerspectiveOrigin: [nsStyleCoord; 2usize], pub mVerticalAlign: nsStyleCoord, - pub mTransitions: [u64; 6usize], + pub mTransitions: nsStyleAutoArray<StyleTransition>, pub mTransitionTimingFunctionCount: u32, pub mTransitionDurationCount: u32, pub mTransitionDelayCount: u32, pub mTransitionPropertyCount: u32, - pub mAnimations: [u64; 9usize], + pub mAnimations: nsStyleAutoArray<StyleAnimation>, pub mAnimationTimingFunctionCount: u32, pub mAnimationDurationCount: u32, pub mAnimationDelayCount: u32, @@ -5310,12 +5364,13 @@ fn bindgen_test_layout_nsStyleSVG() { assert_eq!(::std::mem::align_of::<nsStyleSVG>() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleBasicShape { pub mRefCnt: nsAutoRefCnt, pub _mOwningThread: nsAutoOwningThread, pub mType: nsStyleBasicShape_Type, pub mFillRule: i32, - pub mCoordinates: u64, + pub mCoordinates: nsTArray<nsStyleCoord>, pub mPosition: nsStyleImageLayers_Position, pub mRadius: nsStyleCorners, } @@ -5413,7 +5468,7 @@ pub struct nsStyleSVGReset { } #[test] fn bindgen_test_layout_nsStyleSVGReset() { - assert_eq!(::std::mem::size_of::<nsStyleSVGReset>() , 208usize); + assert_eq!(::std::mem::size_of::<nsStyleSVGReset>() , 216usize); assert_eq!(::std::mem::align_of::<nsStyleSVGReset>() , 8usize); } #[repr(C)] @@ -5426,8 +5481,9 @@ fn bindgen_test_layout_nsStyleVariables() { assert_eq!(::std::mem::align_of::<nsStyleVariables>() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleEffects { - pub mFilters: u64, + pub mFilters: nsTArray<nsStyleFilter>, pub mBoxShadow: RefPtr<nsCSSShadowArray>, pub mClip: nsRect, pub mOpacity: f32, @@ -5439,3 +5495,17 @@ fn bindgen_test_layout_nsStyleEffects() { assert_eq!(::std::mem::size_of::<nsStyleEffects>() , 40usize); assert_eq!(::std::mem::align_of::<nsStyleEffects>() , 8usize); } +/** + * This class is used to replace nsTArray in order to allow generating rust + * bindings for it, and for related classes. + * + * If this class or some of the following asserts have to change, please ping + * bholley, heycam, or emilio first. + * + * <div rustbindgen replaces="nsTArray"></div> + */ +#[repr(C)] +#[derive(Debug)] +pub struct nsTArray<T> { + pub mBuffer: *mut T, +} diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index 96939a3f76f..f1ab19f1233 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -9,6 +9,7 @@ use bindings::{RawGeckoDocument, RawGeckoElement, RawGeckoNode}; use bindings::{RawServoStyleSet, RawServoStyleSheet, ServoComputedValues, ServoNodeData}; use bindings::{nsIAtom}; use data::PerDocumentStyleData; +use env_logger; use euclid::Size2D; use gecko_style_structs::SheetParsingMode; use properties::GeckoComputedValues; @@ -63,6 +64,14 @@ pub fn pseudo_element_from_atom(pseudo: *mut nsIAtom, */ #[no_mangle] +pub extern "C" fn Servo_Initialize() -> () { + // Enable standard Rust logging. + // + // See https://doc.rust-lang.org/log/env_logger/index.html for instructions. + env_logger::init().unwrap(); +} + +#[no_mangle] pub extern "C" fn Servo_RestyleDocument(doc: *mut RawGeckoDocument, raw_data: *mut RawServoStyleSet) -> () { let document = unsafe { GeckoDocument::from_raw(doc) }; let node = match document.root_node() { @@ -72,8 +81,12 @@ pub extern "C" fn Servo_RestyleDocument(doc: *mut RawGeckoDocument, raw_data: *m let data = unsafe { &mut *(raw_data as *mut PerDocumentStyleData) }; // Force the creation of our lazily-constructed initial computed values on - // the main thread, since it's not safe to call elsewhere. This should move - // into a runtime-wide init hook at some point. + // the main thread, since it's not safe to call elsewhere. + // + // FIXME(bholley): this should move into Servo_Initialize as soon as we get + // rid of the HackilyFindSomeDeviceContext stuff that happens during + // initial_values computation, since that stuff needs to be called further + // along in startup than the sensible place to call Servo_Initialize. GeckoComputedValues::initial_values(); let _needs_dirtying = Arc::get_mut(&mut data.stylist).unwrap() @@ -245,9 +258,20 @@ pub extern "C" fn Servo_ReleaseStyleSheet(sheet: *mut RawServoStyleSheet) -> () #[no_mangle] pub extern "C" fn Servo_GetComputedValues(node: *mut RawGeckoNode) -> *mut ServoComputedValues { + use selectors::Element; let node = unsafe { GeckoNode::from_raw(node) }; - let arc_cv = node.borrow_data().map(|data| data.style.clone()); - arc_cv.map_or(ptr::null_mut(), |arc| unsafe { transmute(arc) }) + let arc_cv = match node.borrow_data().map_or(None, |data| data.style.clone()) { + Some(style) => style, + None => { + // FIXME(bholley): This case subverts the intended semantics of this + // function, and exists only to make stylo builds more robust corner- + // cases where Gecko wants the style for a node that Servo never + // traversed. We should remove this as soon as possible. + error!("stylo: encountered unstyled node, substituting default values."); + Arc::new(GeckoComputedValues::initial_values().clone()) + }, + }; + unsafe { transmute(arc_cv) } } #[no_mangle] @@ -330,6 +354,16 @@ pub extern "C" fn Servo_GetComputedValuesForPseudoElement(parent_style: *mut Ser } #[no_mangle] +pub extern "C" fn Servo_InheritComputedValues(parent_style: *mut ServoComputedValues) + -> *mut ServoComputedValues { + type Helpers = ArcHelpers<ServoComputedValues, GeckoComputedValues>; + Helpers::with(parent_style, |parent| { + let style = GeckoComputedValues::inherit_from(parent); + Helpers::from(style) + }) +} + +#[no_mangle] pub extern "C" fn Servo_AddRefComputedValues(ptr: *mut ServoComputedValues) -> () { type Helpers = ArcHelpers<ServoComputedValues, GeckoComputedValues>; unsafe { Helpers::addref(ptr) }; diff --git a/ports/geckolib/lib.rs b/ports/geckolib/lib.rs index 63163583774..7d31b0c3fb3 100644 --- a/ports/geckolib/lib.rs +++ b/ports/geckolib/lib.rs @@ -15,6 +15,7 @@ extern crate app_units; #[macro_use] extern crate cssparser; +extern crate env_logger; extern crate euclid; extern crate heapsize; #[macro_use] diff --git a/ports/geckolib/properties.mako.rs b/ports/geckolib/properties.mako.rs index dfb483ab86a..6db5fb6ef40 100644 --- a/ports/geckolib/properties.mako.rs +++ b/ports/geckolib/properties.mako.rs @@ -16,6 +16,7 @@ use bindings::Gecko_Construct_${style_struct.gecko_ffi_name}; use bindings::Gecko_CopyConstruct_${style_struct.gecko_ffi_name}; use bindings::Gecko_Destroy_${style_struct.gecko_ffi_name}; % endfor +use bindings::{Gecko_CopyListStyleTypeFrom, Gecko_SetListStyleType}; use gecko_style_structs; use glue::ArcHelpers; use heapsize::HeapSizeOf; @@ -43,6 +44,24 @@ pub struct GeckoComputedValues { pub root_font_size: Au, } +impl GeckoComputedValues { + pub fn inherit_from(parent: &Arc<Self>) -> Arc<Self> { + Arc::new(GeckoComputedValues { + custom_properties: parent.custom_properties.clone(), + shareable: parent.shareable, + writing_mode: parent.writing_mode, + root_font_size: parent.root_font_size, + % for style_struct in data.style_structs: + % if style_struct.inherited: + ${style_struct.ident}: parent.${style_struct.ident}.clone(), + % else: + ${style_struct.ident}: Self::initial_values().${style_struct.ident}.clone(), + % endif + % endfor + }) + } +} + impl ComputedValues for GeckoComputedValues { % for style_struct in data.style_structs: type Concrete${style_struct.trait_name} = ${style_struct.gecko_struct_name}; @@ -75,19 +94,7 @@ impl ComputedValues for GeckoComputedValues { // Gecko expects text nodes to be styled as if they were elements that // matched no rules (that is, inherited style structs are inherited and // non-inherited style structs are set to their initial values). - Arc::new(GeckoComputedValues { - custom_properties: parent.custom_properties.clone(), - shareable: parent.shareable, - writing_mode: parent.writing_mode, - root_font_size: parent.root_font_size, - % for style_struct in data.style_structs: - % if style_struct.inherited: - ${style_struct.ident}: parent.${style_struct.ident}.clone(), - % else: - ${style_struct.ident}: Self::initial_values().${style_struct.ident}.clone(), - % endif - % endfor - }) + GeckoComputedValues::inherit_from(parent) } fn initial_values() -> &'static Self { &*INITIAL_GECKO_VALUES } @@ -153,6 +160,8 @@ def set_gecko_property(ffi_name, expr): if is_border_style_masked(ffi_name): return "self.gecko.%s &= !(gecko_style_structs::BORDER_STYLE_MASK as u8);" % ffi_name + \ "self.gecko.%s |= %s as u8;" % (ffi_name, expr) + elif ffi_name == "__LIST_STYLE_TYPE__": + return "unsafe { Gecko_SetListStyleType(&mut self.gecko, %s as u32); }" % expr return "self.gecko.%s = %s;" % (ffi_name, expr) %> @@ -267,7 +276,7 @@ def set_gecko_property(ffi_name, expr): % endif </%def> -<%def name="impl_style_coord(ident, unit_ffi_name, union_ffi_name)"> +<%def name="impl_split_style_coord(ident, unit_ffi_name, union_ffi_name)"> fn set_${ident}(&mut self, v: longhands::${ident}::computed_value::T) { v.to_gecko_style_coord(&mut self.gecko.${unit_ffi_name}, &mut self.gecko.${union_ffi_name}); @@ -281,6 +290,10 @@ def set_gecko_property(ffi_name, expr): } </%def> +<%def name="impl_style_coord(ident, gecko_ffi_name)"> +<%call expr="impl_split_style_coord(ident, '%s.mUnit' % gecko_ffi_name, '%s.mValue' % gecko_ffi_name)"></%call> +</%def> + <%def name="impl_style_struct(style_struct)"> impl ${style_struct.gecko_struct_name} { #[allow(dead_code, unused_variables)] @@ -319,8 +332,8 @@ impl HeapSizeOf for ${style_struct.gecko_ffi_name} { } // FIXME(bholley): Make bindgen generate Debug for all types. -%if style_struct.gecko_ffi_name in "nsStyleBorder nsStylePosition nsStyleDisplay nsStyleList nsStyleBackground "\ - "nsStyleFont nsStyleEffects nsStyleSVGReset".split(): +%if style_struct.gecko_ffi_name in "nsStyleBorder nsStyleDisplay nsStyleList nsStyleBackground "\ + "nsStyleFont nsStyleSVGReset".split(): impl Debug for ${style_struct.gecko_ffi_name} { // FIXME(bholley): Generate this. fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -349,19 +362,22 @@ impl Debug for ${style_struct.gecko_ffi_name} { force_stub += ["list-style-type", "text-overflow"] # Enum class instead of NS_STYLE_... force_stub += ["box-sizing"] - # Inconsistent constant naming in gecko - force_stub += ["text-transform"] # These are booleans. force_stub += ["page-break-after", "page-break-before"] - simple_types = ["Number", "Opacity"] + # Types used with predefined_type()-defined properties that we can auto-generate. + predefined_types = { + "LengthOrPercentage": impl_style_coord, + "LengthOrPercentageOrAuto": impl_style_coord, + "LengthOrPercentageOrNone": impl_style_coord, + "Number": impl_simple, + "Opacity": impl_simple, + } keyword_longhands = [x for x in longhands if x.keyword and not x.name in force_stub] - simple_longhands = [x for x in longhands - if x.predefined_type in simple_types and not x.name in force_stub] - - autogenerated_longhands = keyword_longhands + simple_longhands - stub_longhands = [x for x in longhands if x not in autogenerated_longhands] + predefined_longhands = [x for x in longhands + if x.predefined_type in predefined_types and not x.name in force_stub] + stub_longhands = [x for x in longhands if x not in keyword_longhands + predefined_longhands] %> impl ${style_struct.trait_name} for ${style_struct.gecko_struct_name} { /* @@ -372,12 +388,13 @@ impl ${style_struct.trait_name} for ${style_struct.gecko_struct_name} { /* * Auto-Generated Methods. */ - % for longhand in keyword_longhands: - <%call expr="impl_keyword(longhand.ident, longhand.gecko_ffi_name, longhand.keyword, longhand.need_clone)"></%call> - % endfor - % for longhand in simple_longhands: - <%call expr="impl_simple(longhand.ident, longhand.gecko_ffi_name)"></%call> - % endfor + <% + for longhand in keyword_longhands: + impl_keyword(longhand.ident, longhand.gecko_ffi_name, longhand.keyword, longhand.need_clone) + for longhand in predefined_longhands: + impl_fn = predefined_types[longhand.predefined_type] + impl_fn(longhand.ident, longhand.gecko_ffi_name) + %> /* * Stubs. @@ -461,8 +478,9 @@ fn static_assert() { skip_longhands="${skip_margin_longhands}"> % for side in SIDES: - <% impl_style_coord("margin_%s" % side.ident, - "mMargin.mUnits[%s]" % side.index, "mMargin.mValues[%s]" % side.index) %> + <% impl_split_style_coord("margin_%s" % side.ident, + "mMargin.mUnits[%s]" % side.index, + "mMargin.mValues[%s]" % side.index) %> % endfor </%self:impl_trait> @@ -471,8 +489,20 @@ fn static_assert() { skip_longhands="${skip_padding_longhands}"> % for side in SIDES: - <% impl_style_coord("padding_%s" % side.ident, - "mPadding.mUnits[%s]" % side.index, "mPadding.mValues[%s]" % side.index) %> + <% impl_split_style_coord("padding_%s" % side.ident, + "mPadding.mUnits[%s]" % side.index, + "mPadding.mValues[%s]" % side.index) %> + % endfor +</%self:impl_trait> + +<% skip_position_longhands = " ".join(x.ident for x in SIDES) %> +<%self:impl_trait style_struct_name="Position" + skip_longhands="${skip_position_longhands}"> + + % for side in SIDES: + <% impl_split_style_coord("%s" % side.ident, + "mOffset.mUnits[%s]" % side.index, + "mOffset.mValues[%s]" % side.index) %> % endfor </%self:impl_trait> @@ -489,7 +519,7 @@ fn static_assert() { } </%self:impl_trait> -<%self:impl_trait style_struct_name="Font" skip_longhands="font-size" skip_additionals="*"> +<%self:impl_trait style_struct_name="Font" skip_longhands="font-size font-weight" skip_additionals="*"> // FIXME(bholley): Gecko has two different sizes, one of which (mSize) is the // actual computed size, and the other of which (mFont.size) is the 'display @@ -506,6 +536,18 @@ fn static_assert() { Au(self.gecko.mSize) } + fn set_font_weight(&mut self, v: longhands::font_weight::computed_value::T) { + self.gecko.mFont.weight = v as u16; + } + <%call expr="impl_simple_copy('font_weight', 'mFont.weight')"></%call> + + fn clone_font_weight(&self) -> longhands::font_weight::computed_value::T { + debug_assert!(self.gecko.mFont.weight >= 100); + debug_assert!(self.gecko.mFont.weight <= 900); + debug_assert!(self.gecko.mFont.weight % 10 == 0); + unsafe { transmute(self.gecko.mFont.weight) } + } + // This is used for PartialEq, which we don't implement for gecko style structs. fn compute_font_hash(&mut self) {} @@ -555,6 +597,18 @@ fn static_assert() { </%self:impl_trait> +<%self:impl_trait style_struct_name="List" skip_longhands="list-style-type" skip_additionals="*"> + + <% impl_keyword_setter("list_style_type", "__LIST_STYLE_TYPE__", + data.longhands_by_name["list-style-type"].keyword) %> + fn copy_list_style_type_from(&mut self, other: &Self) { + unsafe { + Gecko_CopyListStyleTypeFrom(&mut self.gecko, &other.gecko); + } + } + +</%self:impl_trait> + <%self:impl_trait style_struct_name="Text" skip_longhands="text-decoration-color" skip_additionals="*"> diff --git a/ports/geckolib/selector_impl.rs b/ports/geckolib/selector_impl.rs index ddc26f6c541..c38ca70104b 100644 --- a/ports/geckolib/selector_impl.rs +++ b/ports/geckolib/selector_impl.rs @@ -19,8 +19,28 @@ pub struct GeckoSelectorImpl; pub enum PseudoElement { Before, After, + + Backdrop, + FirstLetter, FirstLine, - // TODO: Probably a few more are missing here + MozSelection, + MozFocusInner, + MozFocusOuter, + MozListBullet, + MozListNumber, + MozMathAnonymous, + MozNumberWrapper, + MozNumberText, + MozNumberSpinBox, + MozNumberSpinUp, + MozNumberSpinDown, + MozProgressBar, + MozRangeTrack, + MozRangeProgress, + MozRangeThumb, + MozMeterBar, + MozPlaceholder, + MozColorSwatch, AnonBox(AnonBoxPseudoElement), } @@ -167,6 +187,28 @@ impl SelectorImpl for GeckoSelectorImpl { "before" => { return Ok(Before) }, "after" => { return Ok(After) }, "first-line" => { return Ok(FirstLine) }, + "backdrop" => { return Ok(Backdrop) }, + "first-letter" => { return Ok(FirstLetter) }, + "first-line" => { return Ok(FirstLine) }, + "-moz-selection" => { return Ok(MozSelection) }, + "-moz-focus-inner" => { return Ok(MozFocusInner) }, + "-moz-focus-outer" => { return Ok(MozFocusOuter) }, + "-moz-list-bullet" => { return Ok(MozListBullet) }, + "-moz-list-number" => { return Ok(MozListNumber) }, + "-moz-math-anonymous" => { return Ok(MozMathAnonymous) }, + "-moz-number-wrapper" => { return Ok(MozNumberWrapper) }, + "-moz-number-text" => { return Ok(MozNumberText) }, + "-moz-number-spin-box" => { return Ok(MozNumberSpinBox) }, + "-moz-number-spin-up" => { return Ok(MozNumberSpinUp) }, + "-moz-number-spin-down" => { return Ok(MozNumberSpinDown) }, + "-moz-progress-bar" => { return Ok(MozProgressBar) }, + "-moz-range-track" => { return Ok(MozRangeTrack) }, + "-moz-range-progress" => { return Ok(MozRangeProgress) }, + "-moz-range-thumb" => { return Ok(MozRangeThumb) }, + "-moz-metter-bar" => { return Ok(MozMeterBar) }, + "-moz-placeholder" => { return Ok(MozPlaceholder) }, + "-moz-color-swatch" => { return Ok(MozColorSwatch) }, + _ => {} } diff --git a/ports/geckolib/tools/README.md b/ports/geckolib/tools/README.md index 9eefde8be6f..667944fbeed 100644 --- a/ports/geckolib/tools/README.md +++ b/ports/geckolib/tools/README.md @@ -11,7 +11,7 @@ You can see a description of them below. ## `setup_bindgen.sh` This uses downloads a custom version of bindgen, up to date to generate the -bindings, and uses the custom `clang` to build it. +bindings, and uses the required `llvm38` to build it. It will also rebuild it if it's already downloaded. diff --git a/ports/geckolib/tools/regen_style_structs.sh b/ports/geckolib/tools/regen_style_structs.sh index 95833f88a16..d8944445df2 100755 --- a/ports/geckolib/tools/regen_style_structs.sh +++ b/ports/geckolib/tools/regen_style_structs.sh @@ -95,14 +95,14 @@ export RUST_BACKTRACE=1 -match "nsDataHashtable.h" \ -match "nsCSSScanner.h" \ -match "Types.h" \ + -match "utility" \ + -match "pair" \ -match "SheetParsingMode.h" \ -blacklist-type "IsDestructibleFallbackImpl" \ -blacklist-type "IsDestructibleFallback" \ -opaque-type "nsIntMargin" \ -opaque-type "nsIntPoint" \ -opaque-type "nsIntRect" \ - -opaque-type "nsTArray" \ - -opaque-type "nsStyleAutoArray" \ -opaque-type "nsCOMArray" \ -opaque-type "nsDependentString" \ -opaque-type "EntryStore" \ diff --git a/ports/geckolib/tools/setup_bindgen.sh b/ports/geckolib/tools/setup_bindgen.sh index 9863c43f42d..16c4147e9a7 100755 --- a/ports/geckolib/tools/setup_bindgen.sh +++ b/ports/geckolib/tools/setup_bindgen.sh @@ -5,9 +5,9 @@ cd "$(dirname $0)" # Setup and build bindgen. if [ "$(uname)" == "Linux" ]; then - LIBCLANG_PATH=/usr/lib/llvm-3.8/lib; + export LIBCLANG_PATH=/usr/lib/llvm-3.8/lib; else - LIBCLANG_PATH=`brew --prefix llvm38`/lib/llvm-3.8/lib; + export LIBCLANG_PATH=`brew --prefix llvm38`/lib/llvm-3.8/lib; fi # Make sure we have llvm38. diff --git a/ports/geckolib/values.rs b/ports/geckolib/values.rs index 99bf5f6fc40..172ce193b8a 100644 --- a/ports/geckolib/values.rs +++ b/ports/geckolib/values.rs @@ -4,7 +4,7 @@ use cssparser::RGBA; use gecko_style_structs::{nsStyleUnion, nsStyleUnit}; -use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto}; +use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrNone}; pub trait ToGeckoStyleCoord { fn to_gecko_style_coord(&self, unit: &mut nsStyleUnit, union: &mut nsStyleUnion); @@ -46,6 +46,26 @@ impl ToGeckoStyleCoord for LengthOrPercentageOrAuto { } } +impl ToGeckoStyleCoord for LengthOrPercentageOrNone { + fn to_gecko_style_coord(&self, unit: &mut nsStyleUnit, union: &mut nsStyleUnion) { + match *self { + LengthOrPercentageOrNone::Length(au) => { + *unit = nsStyleUnit::eStyleUnit_Coord; + unsafe { *union.mInt.as_mut() = au.0; } + }, + LengthOrPercentageOrNone::Percentage(p) => { + *unit = nsStyleUnit::eStyleUnit_Percent; + unsafe { *union.mFloat.as_mut() = p; } + }, + LengthOrPercentageOrNone::None => { + *unit = nsStyleUnit::eStyleUnit_None; + unsafe { *union.mInt.as_mut() = 0; } + }, + LengthOrPercentageOrNone::Calc(_) => unimplemented!(), + }; + } +} + pub fn convert_rgba_to_nscolor(rgba: &RGBA) -> u32 { (((rgba.alpha * 255.0).round() as u32) << 24) | (((rgba.blue * 255.0).round() as u32) << 16) | diff --git a/ports/geckolib/wrapper.rs b/ports/geckolib/wrapper.rs index f27cf770bf0..91a391fc23c 100644 --- a/ports/geckolib/wrapper.rs +++ b/ports/geckolib/wrapper.rs @@ -344,7 +344,9 @@ impl<'le> TElement for GeckoElement<'le> { fn get_attr<'a>(&'a self, namespace: &Namespace, name: &Atom) -> Option<&'a str> { unsafe { let mut length: u32 = 0; - let ptr = Gecko_GetAttrAsUTF8(self.element, namespace.0.as_ptr(), name.as_ptr(), &mut length); + let ptr = Gecko_GetAttrAsUTF8(self.element, + namespace.0.as_ptr(), namespace.0.len() as u32, + name.as_ptr(), name.len() as u32, &mut length); reinterpret_string(ptr, length) } } diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index 6ae14334f51..09a76398f8c 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -193,7 +193,7 @@ impl Window { #[cfg(target_os = "android")] fn gl_version() -> GlRequest { - GlRequest::Specific(Api::OpenGlEs, (2, 0)) + GlRequest::Specific(Api::OpenGlEs, (3, 0)) } #[cfg(not(target_os = "android"))] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 1d8c6f5cfb2..67d479b9851 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -5,13 +5,13 @@ dependencies = [ "compositing 0.0.1", "devtools 0.0.1", "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "errno 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "errno 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "layout 0.0.1", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "profile 0.0.1", @@ -20,17 +20,17 @@ dependencies = [ "servo 0.0.1", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] [[package]] name = "aho-corasick" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -43,20 +43,20 @@ name = "angle" version = "0.1.0" source = "git+https://github.com/emilio/angle?branch=servo#eefe3506ae13e8ace811ca544fd6b4a5f0db0a04" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "app_units" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -70,24 +70,24 @@ dependencies = [ [[package]] name = "aster" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "azure" -version = "0.4.3" -source = "git+https://github.com/servo/rust-azure#bb2fab861ff63fcc185e5dd7557a021c01e0981d" +version = "0.4.4" +source = "git+https://github.com/servo/rust-azure#7b0164d1d79957b2a59e9e103c02a53761c74b9d" dependencies = [ - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "servo-skia 0.20130412.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -99,20 +99,21 @@ name = "backtrace" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "backtrace-sys" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -123,7 +124,7 @@ dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -133,11 +134,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bitflags" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "bitflags" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -148,22 +144,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "blurz" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "dbus 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "dbus 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "brotli" -version = "0.3.20" -source = "git+https://github.com/ende76/brotli-rs#c243045b88b2d2924c35269586fa9b770184c74c" +version = "0.3.23" +source = "git+https://github.com/ende76/brotli-rs#d8507fd07e9fa57ed8251d5dc500dcd62df62c7c" [[package]] name = "browserhtml" -version = "0.1.4" -source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#0ca50842ba2769a05f2f00f1fd3bfaed4baf03ab" +version = "0.1.5" +source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#146e7909211792ac6d955d87339c547aeb517136" [[package]] name = "byteorder" @@ -174,15 +170,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "canvas" version = "0.0.1" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -192,16 +188,16 @@ dependencies = [ name = "canvas_traits" version = "0.0.1" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "plugins 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -224,17 +220,17 @@ name = "cgl" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "clipboard" version = "0.1.2" -source = "git+https://github.com/aweinstock314/rust-clipboard#4fe9892d7bf8bac075aa60493c6eee7a83e24b7f" +source = "git+https://github.com/aweinstock314/rust-clipboard#f4c5c1d3c1759f0a167091405d11af1f9584fb1f" dependencies = [ "clipboard-win 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "objc-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -255,7 +251,7 @@ name = "cmake" version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -265,8 +261,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -278,8 +274,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "compositing" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "canvas 0.0.1", "canvas_traits 0.0.1", "clipboard 0.1.2 (git+https://github.com/aweinstock314/rust-clipboard)", @@ -288,8 +284,8 @@ dependencies = [ "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gfx_traits 0.0.1", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "layout_traits 0.0.1", @@ -297,16 +293,16 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender 0.1.0 (git+https://github.com/servo/webrender)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -317,27 +313,27 @@ name = "cookie" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-foundation" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-foundation-sys" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -345,9 +341,9 @@ name = "core-graphics" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -355,27 +351,27 @@ name = "core-text" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam" -version = "0.1.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -389,10 +385,10 @@ dependencies = [ [[package]] name = "dbus" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -415,9 +411,9 @@ dependencies = [ [[package]] name = "device" version = "0.0.1" -source = "git+https://github.com/servo/devices#eeac5abfd548b63dcc48873261609922351551e1" +source = "git+https://github.com/servo/devices#cac0952154f65b416acef273a6d1099421ce113e" dependencies = [ - "blurz 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "blurz 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -425,14 +421,14 @@ name = "devtools" version = "0.0.1" dependencies = [ "devtools_traits 0.0.1", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "msg 0.0.1", "plugins 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -443,13 +439,13 @@ dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "msg 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -474,7 +470,7 @@ name = "dylib" version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -553,11 +549,11 @@ dependencies = [ [[package]] name = "errno" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -571,8 +567,8 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -586,10 +582,10 @@ dependencies = [ [[package]] name = "flate2" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -603,16 +599,16 @@ name = "freetype" version = "0.1.0" source = "git+https://github.com/servo/rust-freetype#d564ff90a3c69d987f5c015d7ec034cfaee21aff" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "fs2" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -628,16 +624,16 @@ dependencies = [ [[package]] name = "gaol" version = "0.0.1" -source = "git+https://github.com/servo/gaol#cbb2518029901f078f871a87ebe05cf96d727713" +source = "git+https://github.com/servo/gaol#545c703ebfe7a3a0d7129eb40981527f5d680860" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gcc" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -657,23 +653,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "gfx" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "gfx_traits 0.0.1", - "harfbuzz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "harfbuzz-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -683,18 +679,18 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "range 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-skia 0.20130412.6 (registry+https://github.com/rust-lang/crates.io-index)", "simd 0.1.0 (git+https://github.com/huonw/simd)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -704,15 +700,15 @@ dependencies = [ name = "gfx_traits" version = "0.0.1" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "msg 0.0.1", "plugins 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -731,12 +727,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gleam" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -754,15 +750,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "harfbuzz-sys" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -780,7 +776,7 @@ name = "hbs-common-sys" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -789,7 +785,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hbs-pow-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -799,7 +795,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hbs-builder 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "hbs-common-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -825,46 +821,46 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "tendril 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "tendril 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "httparse" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hyper" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "httparse 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "language-tags 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -879,7 +875,7 @@ dependencies = [ [[package]] name = "image" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -887,8 +883,10 @@ dependencies = [ "gif 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "jpeg-decoder 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "png 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "num-rational 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "png 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -912,26 +910,26 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ipc-channel" version = "0.2.2" -source = "git+https://github.com/servo/ipc-channel#e43fb22c431740a9bc54ce96caebd0e67d1a0586" +source = "git+https://github.com/servo/ipc-channel#10bed82904d635b2ff6a916872130868cb69b104" dependencies = [ "bincode 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -951,7 +949,7 @@ version = "0.1.2" source = "git+https://github.com/servo/rust-mozjs#8ad6c1148fd77e5b9dc2ce0f0ab40d4f455f6f4e" dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -974,24 +972,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "language-tags" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "layers" version = "0.2.4" -source = "git+https://github.com/servo/rust-layers#3cb5df49d7f069eea1f1f0550921c5833cb5bc7f" +source = "git+https://github.com/servo/rust-layers#d7a8a6aa73ec16127042325af4b2d5f9a1fa585d" dependencies = [ - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1003,11 +1001,11 @@ dependencies = [ name = "layout" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.4.3 (git+https://github.com/servo/rust-azure)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "azure 0.4.4 (git+https://github.com/servo/rust-azure)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", @@ -1016,7 +1014,7 @@ dependencies = [ "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layout_traits 0.0.1", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", @@ -1028,15 +1026,15 @@ dependencies = [ "script_traits 0.0.1", "selectors 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1051,9 +1049,9 @@ dependencies = [ "net_traits 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1070,7 +1068,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "leak" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1078,12 +1076,12 @@ name = "leaky-cow" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "leak 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "leak 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libc" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1109,8 +1107,8 @@ name = "libz-sys" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1139,7 +1137,7 @@ name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1149,10 +1147,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memchr" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1160,9 +1158,9 @@ name = "memmap" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "fs2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fs2 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1172,17 +1170,18 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "mime_guess" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1190,8 +1189,8 @@ name = "miniz-sys" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1199,7 +1198,7 @@ name = "mozjs_sys" version = "0.0.0" source = "git+https://github.com/servo/mozjs#2af5849a97a9f18acd482940ba3fa0c6797ed7eb" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1208,18 +1207,18 @@ name = "msg" version = "0.0.1" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1229,44 +1228,44 @@ name = "net" version = "0.0.1" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "brotli 0.3.20 (git+https://github.com/ende76/brotli-rs)", + "brotli 0.3.23 (git+https://github.com/ende76/brotli-rs)", "cookie 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "device 0.0.1 (git+https://github.com/servo/devices)", "devtools_traits 0.0.1", - "flate2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "immeta 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "mime_guess 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "threadpool 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "threadpool 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "net2" -version = "0.2.19" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ws2_32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1275,15 +1274,15 @@ version = "0.0.1" dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1364,17 +1363,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "num_cpus" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "objc" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1386,7 +1383,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "block 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1395,7 +1392,7 @@ name = "objc_id" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1405,41 +1402,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "offscreen_gl_context" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys-extras 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys-extras 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "libressl-pnacl-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1447,12 +1444,12 @@ dependencies = [ [[package]] name = "openssl-sys-extras" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1460,49 +1457,52 @@ name = "osmesa-sys" version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "shared_library 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_codegen" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_generator" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_macros" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_shared" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "pkg-config" @@ -1526,13 +1526,13 @@ dependencies = [ [[package]] name = "png" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1542,16 +1542,16 @@ version = "0.0.1" dependencies = [ "hbs-pow 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "task_info 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1561,30 +1561,30 @@ version = "0.0.1" dependencies = [ "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "plugins 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "quasi_codegen" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi_macros" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quasi_codegen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1601,7 +1601,7 @@ name = "rand" version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1612,8 +1612,8 @@ dependencies = [ "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1622,7 +1622,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1633,7 +1633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ref_slice" -version = "0.1.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1641,8 +1641,8 @@ name = "regex" version = "0.1.69" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1660,7 +1660,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc_version" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1676,12 +1676,12 @@ name = "script" version = "0.0.1" dependencies = [ "angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)", - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas 0.0.1", "canvas_traits 0.0.1", "caseless 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1689,39 +1689,39 @@ dependencies = [ "gfx_traits 0.0.1", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "js 0.1.2 (git+https://github.com/servo/rust-mozjs)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_macros 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_macros 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "ref_filter_map 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ref_slice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ref_slice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.69 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "selectors 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1731,7 +1731,7 @@ dependencies = [ name = "script_traits" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "devtools_traits 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1739,17 +1739,17 @@ dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1759,13 +1759,13 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1776,17 +1776,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "0.7.0" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_codegen" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_macros 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_macros 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1795,22 +1795,22 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_macros" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_codegen 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "servo" version = "0.0.1" dependencies = [ - "browserhtml 0.1.4 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)", + "browserhtml 0.1.5 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)", "canvas 0.0.1", "canvas_traits 0.0.1", "compositing 0.0.1", @@ -1820,11 +1820,11 @@ dependencies = [ "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", "layers 0.2.4 (git+https://github.com/servo/rust-layers)", "layout 0.0.1", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", @@ -1834,7 +1834,7 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "style 0.0.1", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender 0.1.0 (git+https://github.com/servo/webrender)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -1845,7 +1845,7 @@ name = "servo-egl" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1853,7 +1853,7 @@ name = "servo-fontconfig" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig-sys 2.11.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1883,20 +1883,20 @@ dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "shared_library 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-kbd 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1911,10 +1911,10 @@ dependencies = [ "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1928,7 +1928,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1947,7 +1947,7 @@ source = "git+https://github.com/huonw/simd#03de1cd0a278ab902b4beb402d57505f3797 [[package]] name = "smallvec" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1968,18 +1968,18 @@ dependencies = [ "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_generator 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "style" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1992,13 +1992,13 @@ dependencies = [ "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -2006,14 +2006,14 @@ dependencies = [ name = "style_traits" version = "0.0.1" dependencies = [ - "cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -2021,7 +2021,7 @@ dependencies = [ name = "task_info" version = "0.0.1" dependencies = [ - "gcc 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2034,13 +2034,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2051,7 +2051,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "tendril" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2066,7 +2066,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2079,16 +2079,16 @@ dependencies = [ [[package]] name = "threadpool" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "time" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2098,7 +2098,7 @@ name = "tinyfiledialogs" version = "0.1.0" source = "git+https://github.com/jdm/tinyfiledialogs#686abf781f30b360a4c265964fd3744e2f61cf2d" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2116,7 +2116,7 @@ name = "unicase" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc_version 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2137,7 +2137,7 @@ name = "unicode-script" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "harfbuzz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "harfbuzz-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2150,7 +2150,7 @@ dependencies = [ [[package]] name = "url" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2159,7 +2159,7 @@ dependencies = [ "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2188,7 +2188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "util" version = "0.0.1" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2200,23 +2200,23 @@ dependencies = [ "js 0.1.2 (git+https://github.com/servo/rust-mozjs)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "uuid" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2229,14 +2229,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wayland-client" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-scanner 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-sys 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-scanner 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-sys 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2248,20 +2249,20 @@ dependencies = [ "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-scanner" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "xml-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wayland-sys" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dlib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2274,47 +2275,47 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "webrender" version = "0.1.0" -source = "git+https://github.com/servo/webrender#8d778dac5398cadd093136bc9cf0afbbb61a2b52" +source = "git+https://github.com/servo/webrender#e3ee5d46093d0b2bb3c14398914bc9a7a36bcfbd" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", - "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] [[package]] name = "webrender_traits" version = "0.1.0" -source = "git+https://github.com/servo/webrender_traits#d1a3bb53f87891bbba8576d05260caee147dc5d8" +source = "git+https://github.com/servo/webrender_traits#7a51247cb5333d7a4560e00fe4518db328a550da" dependencies = [ - "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)", - "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_macros 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2324,13 +2325,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2345,7 +2346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ws2_32-sys" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2357,7 +2358,7 @@ name = "x11" version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2367,7 +2368,7 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dylib 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2377,18 +2378,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "xml-rs" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "xml-rs" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2398,11 +2391,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "tendril 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "tendril 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index d5f29fea854..40db368bfe8 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -9,6 +9,7 @@ from __future__ import print_function, unicode_literals +import datetime import os import os.path as path import sys @@ -85,7 +86,7 @@ def notify_build_done(elapsed): """Generate desktop notification when build is complete and the elapsed build time was longer than 30 seconds.""" if elapsed > 30: - notify("Servo build", "Completed in %0.2fs" % elapsed) + notify("Servo build", "Completed in %s" % str(datetime.timedelta(seconds=elapsed))) def notify(title, text): @@ -175,21 +176,23 @@ class MachCommands(CommandBase): print("Please specify either --dev or --release.") sys.exit(1) - targets = [] + if target and android: + print("Please specify either --target or --android.") + sys.exit(1) + if release: opts += ["--release"] - if target: - opts += ["--target", target] - targets.append(target) if jobs is not None: opts += ["-j", jobs] if verbose: opts += ["-v"] if android: - opts += ["--target", self.config["android"]["target"]] - targets.append("arm-linux-androideabi") + target = self.config["android"]["target"] + + if target: + opts += ["--target", target] - self.ensure_bootstrapped(targets=targets) + self.ensure_bootstrapped(target=target) if debug_mozjs or self.config["build"]["debug-mozjs"]: features += ["script/debugmozjs"] @@ -202,9 +205,13 @@ class MachCommands(CommandBase): build_start = time() env = self.build_env() + + # Ensure Rust uses hard floats and SIMD on ARM devices + if target: + if target.startswith('arm') or target.startswith('aarch64'): + env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C target-feature=+neon" + if android: - # Ensure Rust uses hard floats on Android - env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C target-feature=+neon" # Build OpenSSL for android make_cmd = ["make"] if jobs is not None: @@ -240,7 +247,7 @@ class MachCommands(CommandBase): # Generate Desktop Notification if elapsed-time > some threshold value notify_build_done(elapsed) - print("Build completed in %0.2fs" % elapsed) + print("Build completed in %s" % str(datetime.timedelta(seconds=elapsed))) return status @Command('build-cef', @@ -276,7 +283,7 @@ class MachCommands(CommandBase): # Generate Desktop Notification if elapsed-time > some threshold value notify_build_done(elapsed) - print("CEF build completed in %0.2fs" % elapsed) + print("CEF build completed in %s" % str(datetime.timedelta(seconds=elapsed))) return ret @@ -313,7 +320,7 @@ class MachCommands(CommandBase): # Generate Desktop Notification if elapsed-time > some threshold value notify_build_done(elapsed) - print("GeckoLib build completed in %0.2fs" % elapsed) + print("GeckoLib build completed in %s" % str(datetime.timedelta(seconds=elapsed))) return ret @@ -330,8 +337,8 @@ class MachCommands(CommandBase): action='store_true', help='Build in release mode') def build_gonk(self, jobs=None, verbose=False, release=False): - targets = ["arm-linux-androideabi"] - self.ensure_bootstrapped(targets=targets) + target = "arm-linux-androideabi" + self.ensure_bootstrapped(target=target) opts = [] if jobs is not None: @@ -351,7 +358,7 @@ class MachCommands(CommandBase): # Generate Desktop Notification if elapsed-time > some threshold value notify_build_done(elapsed) - print("Gonk build completed in %0.2fs" % elapsed) + print("Gonk build completed in %s" % str(datetime.timedelta(seconds=elapsed))) return ret diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 9f2bf307c9d..1623c8fc41f 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -411,7 +411,7 @@ class CommandBase(object): def android_build_dir(self, dev): return path.join(self.get_target_dir(), "arm-linux-androideabi", "debug" if dev else "release") - def ensure_bootstrapped(self, targets=[]): + def ensure_bootstrapped(self, target=None): if self.context.bootstrapped: return @@ -422,13 +422,14 @@ class CommandBase(object): rustc_binary_exists = path.exists(rustc_path) base_target_path = path.join(rust_root, "rustc", "lib", "rustlib") - target_paths = [path.join(base_target_path, t) for t in targets] - all_targets_exist = all([path.exists(p) for p in target_paths]) + target_exists = True + if target is not None: + target_path = path.join(base_target_path, target) + target_exists = path.exists(target_path) - if (not self.config['tools']['system-rust'] and - (not rustc_binary_exists or not all_targets_exist)): + if not (self.config['tools']['system-rust'] or (rustc_binary_exists and target_exists)): print("looking for rustc at %s" % (rustc_path)) - Registrar.dispatch("bootstrap-rust", context=self.context, target=targets) + Registrar.dispatch("bootstrap-rust", context=self.context, target=filter(None, [target])) cargo_path = path.join(self.config["tools"]["cargo-root"], "cargo", "bin", "cargo" + BIN_SUFFIX) diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index 7bbb8c03ed5..3170e07437a 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -118,9 +118,10 @@ class PostBuildCommands(CommandBase): rustCommand = 'rust-' + debugger try: subprocess.check_call([rustCommand, '--version'], env=env, stdout=open(os.devnull, 'w')) - command = rustCommand except (OSError, subprocess.CalledProcessError): pass + else: + command = rustCommand # Prepend the debugger args. args = ([command] + self.debuggerInfo.args + diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index c0bfce1a5f0..eb3aa579b66 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -231,7 +231,7 @@ def check_lock(file_name, contents): raise StopIteration # package names to be neglected (as named by cargo) - exceptions = ["bitflags", "xml-rs", "lazy_static"] + exceptions = ["bitflags", "lazy_static"] import toml content = toml.loads(contents) diff --git a/resources/shaders/gl3_common.fs.glsl b/resources/shaders/gl3_common.fs.glsl index fc8878a9f17..e88e921f65f 100644 --- a/resources/shaders/gl3_common.fs.glsl +++ b/resources/shaders/gl3_common.fs.glsl @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#version 150 - #define SERVO_GL3 +precision highp float; + uniform sampler2D sDiffuse; uniform sampler2D sMask; uniform vec4 uBlendParams; diff --git a/resources/shaders/gl3_common.vs.glsl b/resources/shaders/gl3_common.vs.glsl index 0732a50c5b7..cffcfc80eb7 100644 --- a/resources/shaders/gl3_common.vs.glsl +++ b/resources/shaders/gl3_common.vs.glsl @@ -2,8 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#version 150 - #define SERVO_GL3 uniform mat4 uTransform; diff --git a/rust-nightly-date b/rust-nightly-date index c2a2c7af93b..444753811ff 100644 --- a/rust-nightly-date +++ b/rust-nightly-date @@ -1 +1 @@ -2016-04-24 +2016-04-29 diff --git a/tests/html/bluetooth_device_info.html b/tests/html/bluetooth_device_info.html index 0cdc09a95ab..906dc200362 100644 --- a/tests/html/bluetooth_device_info.html +++ b/tests/html/bluetooth_device_info.html @@ -34,11 +34,6 @@ log('Found a device!'); log('> Name: ' + device.name); log('> Id: ' + device.id); - log('> Device Class: ' + device.deviceClass); - log('> Vendor Id Source: ' + device.vendorIDSource); - log('> Vendor Id: ' + device.vendorID); - log('> Product Id: ' + device.productID); - log('> Product Version: ' + device.productVersion); log('> Appearance: ' + device.adData.appearance); log('> Tx Power: ' + device.adData.txPower + ' dBm'); log('> RSSI: ' + device.adData.rssi + ' dBm'); diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index a32df4781bf..422a97fdf07 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -109,15 +109,15 @@ impl TestProvider { } } impl UIProvider for TestProvider { - fn input_username_and_password(&self) -> (Option<String>, Option<String>) { + fn input_username_and_password(&self, _prompt: &str) -> (Option<String>, Option<String>) { (Some(self.username.to_owned()), Some(self.password.to_owned())) } } -fn basic_auth() -> MockResponse { +fn basic_auth(headers: Headers) -> MockResponse { MockResponse::new( - Headers::new(), + headers, StatusCode::Unauthorized, RawStatus(401, Cow::Borrowed("Unauthorized")), b"".to_vec() @@ -140,7 +140,7 @@ enum ResponseType { RedirectWithHeaders(String, Headers), Text(Vec<u8>), WithHeaders(Vec<u8>, Headers), - NeedsAuth, + NeedsAuth(Headers), } struct MockRequest { @@ -167,8 +167,8 @@ fn response_for_request_type(t: ResponseType) -> Result<MockResponse, LoadError> ResponseType::WithHeaders(b, h) => { Ok(respond_with_headers(b, h)) }, - ResponseType::NeedsAuth => { - Ok(basic_auth()) + ResponseType::NeedsAuth(h) => { + Ok(basic_auth(h)) } } } @@ -208,7 +208,9 @@ impl HttpRequestFactory for AssertAuthHeaderRequestFactory { assert_headers_included(&self.expected_headers, &headers); MockRequest::new(ResponseType::Text(self.body.clone())) } else { - MockRequest::new(ResponseType::NeedsAuth) + let mut headers = Headers::new(); + headers.set_raw("WWW-Authenticate", vec![b"Basic realm=\"Test realm\"".to_vec()]); + MockRequest::new(ResponseType::NeedsAuth(headers)) }; Ok(request) @@ -1442,6 +1444,40 @@ fn test_auth_ui_sets_header_on_401() { } } +#[test] +fn test_auth_ui_needs_www_auth() { + let url = Url::parse("http://mozilla.com").unwrap(); + let http_state = HttpState::new(); + struct AuthProvider; + impl UIProvider for AuthProvider { + fn input_username_and_password(&self, _prompt: &str) -> (Option<String>, Option<String>) { + panic!("shouldn't be invoked") + } + } + + struct Factory; + + impl HttpRequestFactory for Factory { + type R = MockRequest; + + fn create(&self, _: Url, _: Method, _: Headers) -> Result<MockRequest, LoadError> { + Ok(MockRequest::new(ResponseType::NeedsAuth(Headers::new()))) + } + } + + let load_data = LoadData::new(LoadContext::Browsing, url, None, None, None); + + let response = load(&load_data, &AuthProvider, &http_state, + None, &Factory, DEFAULT_USER_AGENT.to_owned(), + &CancellationListener::new(None)); + match response { + Err(e) => panic!("response contained error {:?}", e), + Ok(response) => { + assert_eq!(response.metadata.status, Some(RawStatus(401, Cow::Borrowed("Unauthorized")))); + } + } +} + fn assert_referer_header_matches(request_url: &str, referrer_url: &str, referrer_policy: Option<ReferrerPolicy>, diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-2.htm.ini new file mode 100644 index 00000000000..0b4084807bf --- /dev/null +++ b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-2.htm.ini @@ -0,0 +1,3 @@ +[flexbox_align-items-stretch-2.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-inline.htm.ini index 1068b64b97f..4f004f76131 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-fit-001.htm.ini +++ b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-inline.htm.ini @@ -1,3 +1,3 @@ -[c414-flt-fit-001.htm] +[ttwf-reftest-flex-inline.htm] type: reftest expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-wrap-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c414-flt-wrap-001.htm.ini deleted file mode 100644 index c49077dc944..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/c414-flt-wrap-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[c414-flt-wrap-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/c5525-fltmrgn-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c5525-fltmrgn-000.htm.ini deleted file mode 100644 index 3fbcc8501c8..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/c5525-fltmrgn-000.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[c5525-fltmrgn-000.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/c5525-fltwidth-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c5525-fltwidth-001.htm.ini deleted file mode 100644 index e4109d0f3b3..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/c5525-fltwidth-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[c5525-fltwidth-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-014.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-014.htm.ini deleted file mode 100644 index fd506d75e9d..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-014.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[first-line-pseudo-014.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-015.htm.ini deleted file mode 100644 index db688eec6bc..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/first-line-pseudo-015.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[first-line-pseudo-015.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-132.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-132.htm.ini deleted file mode 100644 index aa8d5c0077b..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/floats-132.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[floats-132.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-top-below-inline-002l.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-top-below-inline-002l.htm.ini deleted file mode 100644 index e93e1abaf40..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-top-below-inline-002l.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[floats-wrap-top-below-inline-002l.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-top-below-inline-002r.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-top-below-inline-002r.htm.ini deleted file mode 100644 index 4ab1abcfff9..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/floats-wrap-top-below-inline-002r.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[floats-wrap-top-below-inline-002r.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini deleted file mode 100644 index 93496ef1249..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[inline-block-zorder-003.htm] - type: reftest - expected: - if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-012.htm.ini deleted file mode 100644 index b8a73649761..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-012.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[inline-replaced-width-012.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-013.htm.ini deleted file mode 100644 index 112842c664c..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-013.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[inline-replaced-width-013.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-015.htm.ini deleted file mode 100644 index 467d013b3cc..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/inline-replaced-width-015.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[inline-replaced-width-015.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-012.htm.ini deleted file mode 100644 index 964e540a51e..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/left-applies-to-012.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[left-applies-to-012.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-012.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-012.htm.ini deleted file mode 100644 index a7994c62eff..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/right-applies-to-012.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[right-applies-to-012.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/cssom-1_dev/html/escape.htm.ini b/tests/wpt/metadata-css/cssom-1_dev/html/escape.htm.ini index ca3b93d8303..4130c045a50 100644 --- a/tests/wpt/metadata-css/cssom-1_dev/html/escape.htm.ini +++ b/tests/wpt/metadata-css/cssom-1_dev/html/escape.htm.ini @@ -1,14 +1,5 @@ [escape.htm] type: testharness - [Null bytes] - expected: FAIL - bug: https://github.com/servo/servo/issues/10685 - - [Various tests] - expected: FAIL - bug: https://github.com/servo/servo/issues/10685 - [Surrogates] expected: FAIL bug: https://github.com/servo/servo/issues/6564 - diff --git a/tests/wpt/metadata/url/url-constructor.html.ini b/tests/wpt/metadata/url/url-constructor.html.ini deleted file mode 100644 index dba2b15a3a2..00000000000 --- a/tests/wpt/metadata/url/url-constructor.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[url-constructor.html] - type: testharness - [Parsing: <h\tt\nt\rp://h\to\ns\rt:9\t0\n0\r0/p\ta\nt\rh?q\tu\ne\rry#f\tr\na\rg> against <about:blank>] - expected: FAIL - diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index a4604810b29..aacefe74da3 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -1644,6 +1644,18 @@ "url": "/_mozilla/css/floats_margin_collapse_with_clearance_a.html" } ], + "css/floats_percentage_width_a.html": [ + { + "path": "css/floats_percentage_width_a.html", + "references": [ + [ + "/_mozilla/css/floats_percentage_width_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/floats_percentage_width_a.html" + } + ], "css/focus_selector.html": [ { "path": "css/focus_selector.html", @@ -2280,6 +2292,18 @@ "url": "/_mozilla/css/inline_background_a.html" } ], + "css/inline_block_absolute_hypothetical_a.html": [ + { + "path": "css/inline_block_absolute_hypothetical_a.html", + "references": [ + [ + "/_mozilla/css/inline_block_absolute_hypothetical_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/inline_block_absolute_hypothetical_a.html" + } + ], "css/inline_block_baseline_a.html": [ { "path": "css/inline_block_baseline_a.html", @@ -6502,6 +6526,12 @@ "url": "/_mozilla/mozilla/mozbrowser/mozbrowsershowmodalprompt_event.html" } ], + "mozilla/mozbrowser/mozbrowsertitlechangedeagerly_event.html": [ + { + "path": "mozilla/mozbrowser/mozbrowsertitlechangedeagerly_event.html", + "url": "/_mozilla/mozilla/mozbrowser/mozbrowsertitlechangedeagerly_event.html" + } + ], "mozilla/mozbrowser/redirect.html": [ { "path": "mozilla/mozbrowser/redirect.html", @@ -8408,6 +8438,18 @@ "url": "/_mozilla/css/floats_margin_collapse_with_clearance_a.html" } ], + "css/floats_percentage_width_a.html": [ + { + "path": "css/floats_percentage_width_a.html", + "references": [ + [ + "/_mozilla/css/floats_percentage_width_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/floats_percentage_width_a.html" + } + ], "css/focus_selector.html": [ { "path": "css/focus_selector.html", @@ -9044,6 +9086,18 @@ "url": "/_mozilla/css/inline_background_a.html" } ], + "css/inline_block_absolute_hypothetical_a.html": [ + { + "path": "css/inline_block_absolute_hypothetical_a.html", + "references": [ + [ + "/_mozilla/css/inline_block_absolute_hypothetical_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/inline_block_absolute_hypothetical_a.html" + } + ], "css/inline_block_baseline_a.html": [ { "path": "css/inline_block_baseline_a.html", diff --git a/tests/wpt/mozilla/tests/css/floats_percentage_width_a.html b/tests/wpt/mozilla/tests/css/floats_percentage_width_a.html new file mode 100644 index 00000000000..051b86f7061 --- /dev/null +++ b/tests/wpt/mozilla/tests/css/floats_percentage_width_a.html @@ -0,0 +1,18 @@ +<!DOCTYPE html> +<meta charset="utf-8"> +<title></title> +<style> +* { + margin: 0; + padding: none; +} +div { + float: left; + width: 100%; + height: 100px; + background: gold; +} +</style> +<link rel="match" href="floats_percentage_width_ref.html"> +<div></div>X + diff --git a/tests/wpt/mozilla/tests/css/floats_percentage_width_ref.html b/tests/wpt/mozilla/tests/css/floats_percentage_width_ref.html new file mode 100644 index 00000000000..b8110a8d1af --- /dev/null +++ b/tests/wpt/mozilla/tests/css/floats_percentage_width_ref.html @@ -0,0 +1,16 @@ +<!DOCTYPE html> +<meta charset="utf-8"> +<title></title> +<style> +* { + margin: 0; + padding: none; +} +div { + width: 100%; + height: 100px; + background: gold; +} +</style> +<div></div>X + diff --git a/tests/wpt/mozilla/tests/css/inline_block_absolute_hypothetical_a.html b/tests/wpt/mozilla/tests/css/inline_block_absolute_hypothetical_a.html new file mode 100644 index 00000000000..612a922a4f9 --- /dev/null +++ b/tests/wpt/mozilla/tests/css/inline_block_absolute_hypothetical_a.html @@ -0,0 +1,12 @@ +<!DOCTYPE html> +<meta charset="utf-8"> +<link rel="match" href="inline_block_absolute_hypothetical_ref.html"> +<style> +span { + display: inline-block; + position: absolute; + top: 32px; +} +</style> +Hello <span>world</span>! + diff --git a/tests/wpt/mozilla/tests/css/inline_block_absolute_hypothetical_ref.html b/tests/wpt/mozilla/tests/css/inline_block_absolute_hypothetical_ref.html new file mode 100644 index 00000000000..2dd7f39da41 --- /dev/null +++ b/tests/wpt/mozilla/tests/css/inline_block_absolute_hypothetical_ref.html @@ -0,0 +1,11 @@ +<!DOCTYPE html> +<meta charset="utf-8"> +<style> +span { + display: inline; + position: absolute; + top: 32px; +} +</style> +Hello <span>world</span>! + diff --git a/tests/wpt/mozilla/tests/css/input_button_margins_a.html b/tests/wpt/mozilla/tests/css/input_button_margins_a.html index 37766fe87e5..9f8f6558343 100644 --- a/tests/wpt/mozilla/tests/css/input_button_margins_a.html +++ b/tests/wpt/mozilla/tests/css/input_button_margins_a.html @@ -7,6 +7,8 @@ body, html { input { margin-left: 64px; border: none; + background: lightblue; + color: transparent; vertical-align: top; } </style> diff --git a/tests/wpt/mozilla/tests/css/input_button_margins_ref.html b/tests/wpt/mozilla/tests/css/input_button_margins_ref.html index 63b80497bf4..b2822ec7e33 100644 --- a/tests/wpt/mozilla/tests/css/input_button_margins_ref.html +++ b/tests/wpt/mozilla/tests/css/input_button_margins_ref.html @@ -7,6 +7,8 @@ input { position: absolute; left: 64px; border: none; + background: lightblue; + color: transparent; } </style> <input type=button value=Hello> diff --git a/tests/wpt/mozilla/tests/mozilla/iframe_contentDocument.html b/tests/wpt/mozilla/tests/mozilla/iframe_contentDocument.html index 28dd011d2cf..dcbb389fdd6 100644 --- a/tests/wpt/mozilla/tests/mozilla/iframe_contentDocument.html +++ b/tests/wpt/mozilla/tests/mozilla/iframe_contentDocument.html @@ -9,19 +9,11 @@ <iframe src="resources/iframe_contentDocument_inner.html" id="iframe"></iframe> <script> async_test(function() { - var timeout = 100; var iframe = document.getElementById('iframe'); - function test_contentWindow() { - if (!iframe.contentWindow) { - // Iframe not loaded yet, try again. - // No load event for iframe, insert bug number here. - setTimeout(this.step_func(test_contentWindow), timeout); - return; - } + iframe.onload = this.step_func_done(function() { assert_equals(iframe.contentDocument.getElementById('test').textContent, 'value'); this.done(); - } - this.step(test_contentWindow); + }) }); </script> </body> diff --git a/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowsertitlechangedeagerly_event.html b/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowsertitlechangedeagerly_event.html new file mode 100644 index 00000000000..4809f302f2f --- /dev/null +++ b/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowsertitlechangedeagerly_event.html @@ -0,0 +1,19 @@ +<!doctype html> +<meta charset="utf-8"> +<title>Check if title_changed is too eager (issue #10782)</title> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<body></body> +<script> + async_test(function(t) { + var iframe = document.createElement("iframe"); + iframe.mozbrowser = "true"; + iframe.src = "mozbrowsertitlechangedeagerly_event_iframe.html"; + iframe.addEventListener("mozbrowsertitlechange", t.step_func(e => { + assert_equals(e.type, "mozbrowsertitlechange"); + assert_not_equals(e.detail, "Bar"); + })); + iframe.addEventListener("load", t.step_func_done()); + document.body.appendChild(iframe); + }); +</script> diff --git a/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowsertitlechangedeagerly_event_iframe.html b/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowsertitlechangedeagerly_event_iframe.html new file mode 100644 index 00000000000..b10a632092a --- /dev/null +++ b/tests/wpt/mozilla/tests/mozilla/mozbrowser/mozbrowsertitlechangedeagerly_event_iframe.html @@ -0,0 +1,16 @@ +<html> + <head> + <title>Foo</title> + <script> + var text = + '<html xmlns="http://www.w3.org/1999/xhtml">' + + ' <head>' + + ' <title>Bar</title>' + + ' </head>' + + '</html>'; + var parser = new DOMParser(); + var doc = parser.parseFromString(text, "text/xml"); + </script> + </head> + <body>Hello world</body> +</html> |