Allow resolution to be configured on command line. Default to 1280x1024.
Change default back to 800x600 as mac travis builders don't work with 1280x1024
Change opts to work in screen pixels that are scaled to device pixels.
When rendering to PNG, draw to an FBO rather than default framebuffer.

This means that it doesn't matter if the window if partially placed
off screen when reftests run.

Fixes #3470.
Remove use of deprecated get_mut_ref
Move global_object_for_js_object to global.rs.

This appears to be a more sensible place for it (related to #433).
Regroup uses of JS constants in utils.rs.
Remove unused cx_for_dom_object function.
Add the MPL back to components/plugins/lints.rs

This license was accidentally removed in 5b866e9e.
Merge pull request #3479 from zwarich/lints-license

Add the MPL back to components/plugs/lints.rs; r=Manishearth
Fix trailing whitespace tidy errors
Merge pull request #3477 from Ms2ger/global

Move global_object_for_js_object to global.rs

Reviewed-by: jdm
Merge pull request #3480 from zwarich/trailing-whitespace

Fix trailing whitespace tidy errors

Reviewed-by: larsbergstrom
Merge pull request #3478 from zwarich/get-mut-ref

Remove use of deprecated get_mut_ref

Reviewed-by: metajack
layout: Unify the block-size computation for blocks and floats.

The float code was old and did not support most of CSS 2.1. So unifying
the two paths both simplifies code and improves functionality.

Improves the Reddit sidebar.
Merge pull request #3472 from pcwalton/unify-block-and-float-layout

layout: Unify the block-size computation for blocks and floats.

Reviewed-by: glennw
Merge pull request #3398 from glennw/config-res

Allow resolution to be configured on command line. Default to 1280x1024.

Reviewed-by: SimonSapin
layout: Enhance the heuristic that guesses the inline size of block
formatting contexts.

The widths of block formatting contexts depend on the floats prior to
them. To avoid a circular dependency between width assignment and height
assignment, we must guess their widths during the assign-widths pass.
The old code simply used the size of the last float, whether
left-floated or right-floated, but this proved insufficient to handle
layouts like those seen on Reddit. The new heuristic keeps track of both
left and right floats independently and sums the width of all left and
right floats to determine the width of a block formatting context. This
is still insufficient to properly lay out Reddit, but the results are
much more acceptable.

A fully correct approach will require that blocks be laid out again if
the initial guess proved to be incorrect. A `TODO` is in the code to
handle this case.
Merge pull request #3467 from pcwalton/enhance-block-formatting-context-guess

layout: Enhance the heuristic that guesses the inline size of block formatting contexts.

Reviewed-by: glennw
Improve acid2. Fix line height calculation. Text fragments get correct enclosing element style.

* Enabled acid2 on mac + linux. Updated the reference image. The only difference from the
real acid2 now is the paint order and a 1 pixel horizontal offset on the nose.
* Change line-height to be calculated correctly.
* Apply enclosing element style to text fragments.