Bug 995065 - Don't block on the Compositor for more than 100ms. r=jgilbert
Bug 949166 - Actually compile the Windows 7 detection code in cubeb's test to disable part of a test. r=kinetik
Bug 983465. Disable collapsing-text frame construction optimization on a per-document basis. r=bz

--HG--
extra : rebase_source : fc2059ac826e001660fb7233d775f8a046467f6b
Bug 791480. Make reftests enter print mode before reftest-wait is removed, so canvas-print-callback tests can finish drawing before the test ends. r=dbaron

--HG--
extra : rebase_source : f5b0ded43f9ef670478a06daf36c44987bd6b823
Bug 791480. Reenable test on Windows 7. r=dbaron

--HG--
extra : rebase_source : f4432bc6143e84c58d590dc80dfcb41419524b5d
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 : 974434342459b76d62d89fdc04c22c518bf0c58b
Bug 972713. Part 2: Ignore active scrolled roots in inactive layer trees, because they don't help and could hurt. r=mattwoodrow

--HG--
extra : rebase_source : 3c1c4abb6685f106f927f0f43dbb62fe64a37038
Merge m-c to fx-team
Bug 986458 - Disable browser_whitelist7.js on Win/OSX debug for perma-fails with chunked mochitest-bc.
Bug 608820 - Disable browser_bug567127.js on Win/OSX for frequent failures.
CLOSED TREE
Merge m-c to fx-team on a CLOSED TREE.
Bug 989549 - Call signOut() in FxAccountsClient.jsm from signOut() in FxAccounts.jsm. r=markh
Bug 992373 - Items in the panel jump up slightly when the customization transition finishes. r=Gijs, mikedeboer.
Bug 992747 - toolbar visibility setting doesn't work for non-customizable toolbars, r=jaws
Bug 981827 - Make Android and Desktop FxAccounts client use same key parameters. r=rnewman
Bug 990685: Dispatch document-element-inserted for XUL documents. r=bz
Bug 968419 - Store and submit a persistent health report identifier; r=rnewman, r=bsmedberg

Up to this point, Firefox Health Report has generated and submitted a
random UUID with each upload. Generated UUIDs were stored on the client.
During upload, the client asked the server to delete all old UUIDs.
Well-behaving clients thus left at most one record/ID on the server.

Unfortunately, clients in the wild have not been behaving properly. We
are seeing multiple documents on the server that appear to come from the
same client. Clients are uploading new records but failing to delete the
old ones. These old, undeleted "orphan" records are severely impacting
the ability to derive useful knowledge from FHR data because it is
difficult, resource intensive, and error prone to filter the records on
the server. This is undermining the ability for FHR data to be put to
good use.

This patch introduces a persistent client identifier. When the client is
initialized, it generates a random UUID. That UUID is persisted to the
profile and sent as part of every upload.

For privacy reasons, if a client opts out of data submission, the client
ID will be reset as soon as all remote data has been deleted.

We still issue and send upload IDs. They exist mostly for forensics
purposes so we may log client behavior and more accurately determine
what exactly misbehaving, orphan-producing clients are doing.

It is worth noting that this persistent client identifier will not solve
all problems of branching and orphaned records. For example, profile
copying will result in multiple clients sharing a client identifier. A
"client ID version" field has been added to facilitate an upgrade path
towards client IDs with different generation semantics.

--HG--
extra : rebase_source : b761daab39fb07b6ab8883819d68bf53462314a0
Bug 978596: Implement native MAR verification for OS X 10.7+. r=bbondy, rstrong, smichaud
Bug 989641 - Move FlattenedMResumePointIter into LRecover. r=jandem
Bug 989667 - Add writes of recovery meta-data to the MResumePoint. r=h4writer