Fixed this issue (https://github.com/mozilla/rust/issues/10683)
add FIX comments
Remove unused import.
InlineFlow should always inherit text-width from base style

Fixes #222.
auto merge of #1401 : saneyuki/servo/unused, r=metajack

Fix this warning:
```
servo/src/components/gfx/platform/macos/font_list.rs:6:4: 6:42 warning: unused import, #[warn(unused_imports)] on by default
servo/src/components/gfx/platform/macos/font_list.rs:6 use font_context::FontContextHandleMethods;
```
auto merge of #1349 : dhedlund/servo/issue_222, r=jdm,me

Fixes #222.

Implements 'text-align' inheritance for inline elements.  The text alignment code has been changed a couple of times since the ticket was originally opened and was improved to inherit the text-align property from from an ancestor element.  This addressed the issue, so long as no inline elements had a text-align property defined.  Both Firefox and Chromium ignore any text-align properties attached to inline elements, but none of the specs are explicit about ignoring the property or inheriting only from non-inline elements:
http://www.w3.org/TR/CSS2/visuren.html#inline-formatting
http://www.w3.org/TR/CSS2/text.html#propdef-text-align

This is my first stab at writing any code that touches the DOM node tree.  Based on a few observations, I made the assumption that the `self.base.node` of a InlineFlow always corresponds to a BlockFlow-based node, no matter how deep inline DOM elements are nested; there was no obvious way to traverse Flow-traited objects directly and I'm not sure if it's possible to get from a FlowData struct back to a non-child {Block,Inline}Flow (probably intentionally).

I could've kept traversing the node tree directly, checking against each node style to ensure it didn't have an inline display property, but I could not create a scenario where the `base.node` was ever an inline.  It also feels like a code smell to be walking up the tree at all, especially for stylesheet properties.  Feels like it should eventually be handled in style::properties directly as being conditional inherited?
Mark some rust files as non-executable.
auto merge of #1403 : Ms2ger/servo/exec, r=metajack
constellation: Stop using futures for frame sizes.

This will allow us to stop going to the DOM in order to handle iframe
sizing. Instead we can just store the pipeline and frame IDs of iframes
inside the flow tree itself.
auto merge of #1405 : pcwalton/servo/defuture, r=larsbergstrom

This will allow us to stop going to the DOM in order to handle iframe
sizing. Instead we can just store the pipeline and frame IDs of iframes
inside the flow tree itself.

r? @kmcallister
layout: Stop going to the DOM for iframe sizes
auto merge of #1408 : pcwalton/servo/stop-going-to-dom-for-iframes, r=larsbergstrom

r? @larsbergstrom
auto merge of #1388 : hyunjunekim/servo/cssissues, r=kmcallister

Fixed this issue ( https://github.com/mozilla/rust/issues/10683 )
Adjust PNG encoder color type to match what's read from gl2

This should fix images produced by the -o flag.
Add glfw window_refresh_callback, windows now redraw on linux

Fixes #941.
auto merge of #1414 : dhedlund/servo/issue_941, r=larsbergstrom

Moving another window on top of servo window, or switching screen would result in a blank window until the app was resized.  This was due to a missing glfw callback.

Fixes #941.
Drain compositor_chan on shutdown, causes deadlocks on constellation

Constellation blocks on SetId by sending a Port through the compositor
channel and waits for a response.  If the compositor is in the process of
shutting down, it will not look in the queue again.  The compositor
requires the constellation to be shut down first, so it sends a message
to shut down and blocks until the constellation finishes, deadlocking.

Only very short lived executions would've been likely to see this deadlock.
auto merge of #1415 : dhedlund/servo/constellation_deadlock, r=pcwalton

Constellation blocks on SetId by sending a Port through the compositor channel and waits for a response.  If the compositor is in the process of shutting down, it will not look in the queue again.  The compositor requires the constellation to be shut down first, so it sends a message to shut down and blocks until the constellation finishes, deadlocking.

Only very short lived executions would've been likely to see this deadlock.

_It is technically still possible to trigger a SetId message between when the compositor finishes running and when the constellation shuts down, but the window for exposure is greatly reduced.  I've only seen it with "-o" so far._
style: Reduce allocations in selector matching.

This is a 27% improvement in CSS selector matching performance.
auto merge of #1393 : pcwalton/servo/optimize-css, r=pcwalton

This is a 27% improvement in CSS selector matching performance.

r? @SimonSapin