import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1195173 - Test asyncopen2 security checks for stylesheets (r=bz,ehsan) (358ae850a4)
- Bug 1223644 - Clean up the nsSVGClipPathFrame reference loop detection code. r=longsonr (65042c3148)
- Bug 1157064 - font-display descriptor parsing. r=dbaron (18f63d9244)
- Bug 1242523 - Guard against GetWidget getting called with a null shell. r=snorp (55de891c6c)
- Bug 1247679, part 3 - Replace NS_IMPL_CYCLE_COLLECTION_TRACE_JSVAL_MEMBER_CALLBACK with JS_MEMBER. r=smaug (09435e582c)
- Bug 1247515 - Check nsScriptErrorWithStack's mStack member for null before tracing; r=mccr8 (0cb1e09aa9)
- Bug 1178803. Fix the handling of the 'length' key in IDB keypaths when operating on a string. r=bent (69f15272a8)
- Bug 1240660 - Remove "+" prefixes in jar manifests. r=gps (27de5a6a87)
- Bug 1240660 - Remove support for the "+" prefix in jar manifests. r=gps (2bdf115c40)
- 1240660 fallout fix (3b1c1e2d8b)
- Back out the videocontrols piece of bug 1231828 due to b2g breakage and add to the ignore list. r=backout (bffe92e32c)
- Bug 1201037 - coalesce network-events on Windows, r=mcmanus (5f48aab5c3)
- Bug 1131626, fix autoscroll tests to work in e10s, r=felipe (c47adbaa10)
- Bug 1231529 - Increase the timeout of browser_bug295977_autoscroll_overflow.js (691d27224d)
- Bug 416611 - Changed BookmarkHTMLUtils.jsm to import bookmark tags from HTML document. r=mak (49a0accc13)
- Bug 1130858 - Recipient autocomplete suggestion overrides ANY manual address input if quickly entered/pasted and confirmed with Enter/Tab before autocomplete suggestions disappear. r=mak (308196e116)
- Bug 1197361. Optimize page thumbnails based on screen size. r=ttaubert (29dca20366)
- Bug 555087 - Add check for exception when passing undefined parameter. r=adw (3588477c56)
- Bug 750544 - Remove the scope bar from the Library window. r=mano. (e1544ca40a)
- Bug 1175678 - Update icons for different Mixed Content Blocking states in the URL bar r=MattN (79a8c1d70a)
- remove parent folder (95af2afea6)
- Bug 1145063 - Remove the keywords column from the Library r=mak (600f18004a)
- Bug 1203803: Force cleanup for specific states only; r=khuey a=CLOSED TREE (2f9f78ad72)
- Bug 1203803 - Remove forced cleanup from FactoryOp::ActorDestroy() since it cause more harm than good; r=khuey (76a00e58cb)
- Bug 1195149 - Upgrade the  check to a MOZ_RELEASE_ASSERT. r=janv (071d1fc267)
- Bug 1185223 - crash at [@ mozilla::dom::quota::QuotaObject::Release() ]; r=khuey (d460972a45)
- Bug 1229376 - Downgrade lastVacuumSize > 0 assertion to an NS_ASSERTION so we don't have to star it all over the place, rs=khuey (81d715ab71)
- Bug 1239666 - part 1, get rid of the default parameter. r=waldo (639fb79ec3)
- Bug 1239666 - part 2, dom/indexedDB change. r=khuey (6faaf25df4)
- Bug 1239666 - part 3, devtools test case changes. r=sphink (c010d06a77)
- Bug 1248309 - Fix caret size not updated when only zoom level is changed. r=roc (91cc5b35df)
- bits of Bug 983623 - Implement cmd_un/redo for the new async TM (7fd41a9c37)
- Bug 1245649: Turn on no-trailing-spaces. r=Gijs (7f87c967af)
- Bug 1245649: Enable no-negated-in-lhs, no-native-reassign, no-func-assign and no-labels. r=MattN (5f801e4a4c)
- Bug 1177639 - ensure copy is made visible again, r=mak (a0a3238cc1)
- Bug 993274 - Remove cmd_new:livemark. r=mak (2a29f447d5)
- more openparent removal (e8f0c74bbd)
- minor fixes (b80d0307e9)
- hide pocket, we don't support it anyway (8a802e9e5b)
- Bug 1197966 - Fix typo when releasing content-side probes in PerformanceStats-content.js. r=felipe (9241324efd)
- Bug 1219144 - Performance alerts are now labelled with isJankVisible; r=avih,froydnj (c1549a24f5)
- Bug 1219144 - Using the nsRefreshDriver's jank indication for performance monitoring;f?froydnj r=froydnj (735c6fba9c)
- Bug 1211783 - Add KeyframeEffect interface to dom/webidl/KeyframeEffect.webidl. r=smaug,birtles (fca332fea0)
- Fix up missing dependency in bug 1247162. r=me (897f1ebd9b)
- Bug 795681 - Print out failures in mozunit runner. r=gps (ce418e5ea8)
- Bug 801679 - Handle expected failures and skipped tests in mozunit runner. r=gps (396ca02893)
- Bug 1247833 - Display the class name in mozunit output. r=gps (0b5724f41c)
- Bug 1245022 - Kill stlport's Makefile.in. r=mshal (225f662efc)
- Bug 1194603 - Remove INTERNAL_TOOLS; r=mshal (e8e90ec1c3)
- Bug 1247994 - Upgrade vendored requests package to 2.9.1; r=mshal (591a9e849a)
- Bug 1234612: Print path when failing to create virtualenv r=gps (ae69d82c1f)
- Bug 1235109 - Remove support for -I in preprocessor and jar maker. r=gps (a6c60bb407)
- Bug 1248027 - '#define FOO' should use an empty value, not '1'; r=glandium (8a3a33bad9)
- Bug 1239872 - Prevent jar maker from installing the same file twice. r=gps (4c3e496212)
- Bug 1224450 - Skip difficult directories in the CompileDB. r=gps (4fe09cff61)
- Bug 1245015 - Properly handle ObjC sources in the CompileDB backend. r=mshal (9d2f312c01)
- Bug 1224450 - Ignore host compilations in the CompileDB backend. r=gps (c0e6d114b5)
- Bug 1224450 - Make the CompileDB derive its commands from the moz.build data. r=gps (abee41178f)
- Bug 1247743 - Expose non-pinning JS_Atomize[UC]String JSAPI functions; r=terrence (66aa23066d)
- Bug 1230071 - Enable warnings-as-errors in js/src. r=Waldo (a0c8acf6ad)
- Bug 1007136 - Ensure malloc/free always match when using JSAutoByteString; r=bz (81dfcf036a)
- Bug 1246850 - check the NotifyIpInterfaceChange() return code, r=mcmanus (bc224f287c)
- Bug 739029 - null check a thread allocation in notifyaddrlistener r=bagder (ce0ddfc44c)

dom/html/nsDOMStringMap.cpp

@@ -38,7 +38,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(nsDOMStringMap)
   NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER
   if (tmp->PreservingWrapper()) {
-    NS_IMPL_CYCLE_COLLECTION_TRACE_JSVAL_MEMBER_CALLBACK(mExpandoAndGeneration.expando);
+    NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mExpandoAndGeneration.expando)
   }
 NS_IMPL_CYCLE_COLLECTION_TRACE_END