Bug 966493 - Mark touchstart and end events as handling user input. r=smaug
Bug 1064844 - Only restore propagatingForcedReturn state in AutoSaveExceptionState if there isn't a new error. (r=jorendorff)
Bug 1061684 - Normalize path separators in JAR paths; r=mshal

The forward slash appears to be the standard path separator in zip/JAR
files. Accept back slashes when adding paths to a JAR.

--HG--
extra : rebase_source : bd94eab36b347006e65952d99b53dd397e2ca758
extra : amend_source : 2cefd887d8bb5d989fafb398a3464429ac376e2e
Bug 1062016 - Editing state gets out of sync. r=yzen
Bug 1064699 -  Update mLastVideoFrameTime after it's used for computing the frame duration.  r=cajbir
Bug 981198 - Internally move the JSErrorReporter to the JSRuntime. r=terrence
Bug 981198 - Make JS_{Get,Set}ErrorReporter take a JSRuntime. r=terrence,r=bz
(no bug) Some comment-only cleanup in nsLayoutUtils.h. (no review, comment-only)
DONTBUILD

In particular:
 - Rewrapped a few lines to 80 characters.
 - Fixed a few typos.
 - Added a terminal period character at the end of @param/@return lines, in cases where the rest of the function's documentation follows that convention.
Bug 1064432 - Add mochitest-webgl.ini unified mochitest manifest. - r=kamidphish
Bug 1059583 - Add CanvasLayer::MustLayerUpdateBeSynchronous. - r=kamidphish,mattwoodrow
Bug 1061468 - Notify the editor when removing the focused element is its ancestor limiter.  r=ehsan
Bug 1061468 - Test that the caret is not rendered after a focused contenteditable element is removed from the document.
Merge m-c to inbound. a=merge
Backed out changeset 65cda04dc8d2 (bug 1064432) for bustage on all platforms.
CLOSED TREE
Backed out changeset 96a507248c53 (bug 1059583) for Werror bustage.
CLOSED TREE
Bug 1055285 part 1: Implement CSS parsing & computation for 'object-fit' property. r=heycam
Bug 1055285 part 2: Implement CSS parsing & computation (but not animation) for 'object-position' property. r=heycam
Bug 1055285 part 3: Implement animation for 'object-position' property. r=heycam
Bug 1055285 part 4: Extend test_transitions_per_property.html with a few more scenarios for background-position & object-position transitions. (no review)
Bug 1050159. Apply correct dirty rect when AddCanvasBackgroundColorItem creates an nsDisplaySolidColor. r=mattwoodrow

--HG--
extra : rebase_source : a762a87108b7b7a36664a5590b43fbd28b4842d1