Bug 969012 - Make jit allocations of CallObject with external slots use the nursery; r=jandem
Bug 961364 - Clear the column type bits before setting them in nsTableCol{,Group}Frame::SetColType. r=dbaron
Backout bea3f06585ec (Bug 969012) for arm simulator failures.
Bug 972713. Part 1: Make all callers of GetAnimatedGeometryRootFor pass a display item so we can stop searching when we reach the item's reference frame. r=mattwoodrow
This guarantees that the animated geometry root for an item is always in the
same display list coordinate system as the frame.

--HG--
extra : rebase_source : 249fd847a2c08f8d0846d698cce9dd4681e38a98
Bug 972713. Part 2: Ignore active scrolled roots in inactive layer trees, because they don't help and could hurt. r=mattwoodrow
Bug 965655:  Revert test disabling from changeset 8a0d810a0cca now that bug 969590 (switch of test slaves) is fixed.
Make fix-linux-stack handle addresses with lowercase hexidecimal, since that seems to be the thing these days.  No bug.

(mrbkap, I, and ehoogeveen have all seen lowercase lately.)
Bug 709014 patch 1:  Honor margin-left and margin-right on elements in inline layout that have 0 width and/or height (commonly, inline-blocks).  r=roc

Prior to this patch, we failed to honor:
 * margin-left on elements in inline layout with 0 width and 0 height
 * margin-right on elements in inline layout with 0 width
I think that was because the code in CanPlaceFrame to discard both
margins when the width was 0 was running after the left-margin was
applied, unless the later code in PlaceFrame (checking both width 0 and
height 0) un-applied that left margin.

The assertion count change in test_value_computation.html is due to 2
additional "bad width" assertions (I presume from honoring large
margins that were previously ignored).

The change to 538935-1-ref.html is to match an improvement in rendering
of the margins in the test, where both sides of the margin are now
honored.

The change to layout/reftests/text-overflow/marker-basic-ref.html is to
keep the reference (which uses margins) rendering the same way following
the changes to margin handling.

The new behavior (in the reftests added in layout/reftests/inline/)
matches at least Chromium; I didn't check any other browsers.
Bug 480888 patch 5:  Add tests that should catch the regression across platforms that was previously caught only by a reftest on Android.

The outline-overflow-inline-block-* tests fail, as expected, with the
aOverflowOverride parameter to UnionBorderBoxes always changed to null.
Note that the outline-overflow-inline-block-* tests depend on the fix
for bug 709014.
Bug 434102:  Make outlines behave reasonably on XUL tree pseudo-elements again.  r=roc

This was a regression from bug 133165 which I noticed while working on
bug 480888, but wished to fix in a separate patch (despite that it would
have been slightly easier to fix it in the same patch).
test for bug 938022

--HG--
extra : transplant_source : %FE%A1%93%10%AE%86C%F7G%00%9B%E3Y%F7%08%DF%A26%1A%5B
debug logging for bug 966322

--HG--
extra : transplant_source : %F1%F9%BF%04%A3%10W%E1%22%E21%05%92%B9%5B%FCd%13%D4%BA
Merge m-c to m-i
Bug 434102 followup:  Mark reftest as failing on Mac.
Update test failure annotation for bug 791480, now that we're running tests on Windows NT 6.2 as well.
Bug 973389 - Move the LOCAL_INCLUDES in mozglue to moz.build; r=glandium
Bug 973391 - Move the LOCAL_INCLUDES in webapprt to moz.build; r=glandium
Bug 973403 - Move the LOCAL_INCLUDES in memory to moz.build; r=glandium
Bug 973402 - Move the LOCAL_INCLUDES in js/src to moz.build; r=glandium
Bug 973646 - Port some CXXFLAGS logic in js/src/Makefile.in to the DEFINES variable; r=glandium