Bug 1115812 patch 7 - Always call DoProcessRestyles if mInRebuildAllStyleData. r=heycam This is needed for patch 9 (once patch 9 is used via the ProcessPendingRestyles() codepath in patch 13); it ensures that when we use the new way of rebuilding, we don't bail out early because we think we have nothing to do.

Bug 1115812 patch 6 - Move ProcessRestyles from RestyleTracker to RestyleManager. r=heycam This is needed for the following patch, so that it can access a member variable of RestyleManager.

Bug 1115812 patch 5 - Store the state of whether we're currently rebuilding all style data in a member variable, to prepare for future merging of the rebuild into other code. r=heycam This adds a member variable that is currently only used within a single function, but that function will be split apart so that different parts of it can be called from different places within ProcessPendingRestyles.

Bug 1115812 patch 4 - Rename mRebuildAllStyleData to mDoRebuildAllStyleData. r=heycam This is the variable that says we *need to* rebuild style data. Since the next patch will introduce a variable that says we're *currently* rebuilding all style data, renaming this one makes things clearer.

Bug 1115812 patch 3 - Pass the hints to DoRebuildAllStyleData via the member variables, in preparation for future refactoring. r=heycam Part of this refactoring involves the ability to start the rebuild-all process within the processing of restyles. This means we can't pass parameters directly from RebuildAllStyleData into DoRebuildAllStyleData. So this continues storing the hints as member variables a little bit deeper into the process. (I tried to move in a different direction in this patch queue, and store these hints in mPendingRestyles, for the root element. But that broke layout/style/test/test_counter_style.html and layout/style/test/test_font_loading_api.html, and I didn't want to figure out why. It would be somewhat better in the long run, since currently these hints will get processed if we do a rebuild-all on a RestyleTracker other than mPendingRestyles, which can happen if we have 'rem' units and have a root element font size change in the animation-only update or in mPendingAnimationRestyles.)

Bug 1115812 patch 2 - Move the eRestyle_ChangeAnimationPhaseDescendants hint in DoRebuildAllStyleData so that the new rebuild-all codepaths will keep it. r=heycam The patches in this series refactor the process of rebuilding all style data (RestyleManager::RebuildAllStyleData and RestyleManager::DoRebuildAllStyleData) so that the process of rebuilding all style data uses the existing restyle processing loops in ProcessPendingRestyles. (Rebuilding all style data is what we do when we need to throw away the rule tree because something has invalidated the cached data in it.) This removes (increasing, especially with bug 960465 coming) code duplicated between the two codepaths, fixes some omissions from the separate rebuild-all codepath, and (more immediately) allows fixing lifetime issues of ReframingStyleContexts objects in bug 1110277 so that we can have a single ReframingStyleContexts for all of the restyle processing in each restyle processing operation. In other words, the goal is to change the rebuild-all process from a separate codepath to a few variables that modify the way ProcessPendingRestyles works (and make it do the extra work). This is just a small first step in that process, which moves one piece of code from a chunk of duplicated and to-be-removed code into a chunk of code that will be preserved.

Bug 1115812 patch 1 - Remove obsolete comment that was fixed by bug 1047928. r=heycam

Bug 908987 - Honor mIsActive more aggressively to avoid calling IsVisibleConsideringAncestors. r=roc This means that we avoid an O(N^2) calling pattern of IsVisible when we call IsVisible for all tabs of a tabbrowser, since in a tabbrowser (which uses an nsDeckFrame), IsVisibleConsideringAncestors is O(N) in number of earlier tabs.

Bug 1116056 - Change MOZ_ASSERT() to NS_WARNING() in Box::Read(); r=jya

Bug 1121065 - Ensure Software Vsync TimeStamp is never in the future. r=kats

Bug 1120257 (part 2) - Remove some duplicated inline string methods. r=jandem. Some of the inline string methods have a templated and a non-templated version, e.g. lengthFits() and init(). Others don't, e.g. NewInlineString(). Having both seems unnecessary, so this patch removes the non-templated versions.

Bug 1120257 (part 1) - Clarify inline string naming by adding JSThinInline. r=jandem. This patch introduces a new sub-class of JSInlineString called JSThinInlineString, and moves the operations specific to thin inline strings into it. JSInlineString now clearly subsumes both of JS{Thin,Fat}InlineString, and "inling string" now clearly subsumes both of "thin inline string" and "fat inline string". Despite adding yet another JSString subclass, I think it makes things clearer :) The patch also renames a bunch of things accordingly, and removes the dead resetLength() declaration.

Bug 1120630 - Skip tests failing with e10s enabled.;r=jgriffin

Bug 1120630 - Add --e10s to turn on electrolysis for marionette tests.;r=jgriffin

Merge m-c to inbound a=merge

Bug 1116187 - Add in-tree config for B2G mochitest-chrome, r=gbrown

Bug 1121256: Remove commented-out debugging printfs from 1998, in nsSubDocumentFrame::Reflow. (comment-only, no review, DONTBUILD)

Bug 1117768 - unified bustage followup on a CLOSED TREE

Bug 1117768 - Fix assertion in AutoStopVerifyingBarriers and add tests, r=terrence

Bug 1105388 - Avoid robocop shutdown crashes with longer wait; r=mfinkle