merge mozilla-inbound to mozilla-central. r=merge a=merge

MozReview-Commit-ID: TaCJmNGpct

browser/components/search/test/browser.ini

@@ -24,6 +24,7 @@ support-files =
 skip-if = os == "mac" # bug 967013
 [browser_ddg.js]
 [browser_eBay.js]
+skip-if = artifact # bug 1315953
 [browser_google.js]
 skip-if = artifact # bug 1315953
 [browser_google_codes.js]

dom/html/HTMLTrackElement.cpp

@@ -68,7 +68,7 @@ static constexpr nsAttrValue::EnumTable kKindTable[] = {
 
 // Invalid values are treated as "metadata" in ParseAttribute, but if no value
 // at all is specified, it's treated as "subtitles" in GetKind
-static constexpr const nsAttrValue::EnumTable* kKindTableInvalidValueDefault = &kKindTable[4];
+static const nsAttrValue::EnumTable* const kKindTableInvalidValueDefault = &kKindTable[4];
 
 class WindowDestroyObserver final : public nsIObserver
 {

dom/media/webrtc/WebrtcGlobal.h

@@ -28,7 +28,7 @@ struct ParamTraits<mozilla::dom::Sequence<T>>
 
   static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
   {
-    return ReadParam(aMsg, aIter, dynamic_cast<FallibleTArray<T>*>(aResult));
+    return ReadParam(aMsg, aIter, static_cast<FallibleTArray<T>*>(aResult));
   }
 };
 

dom/workers/test/mochitest.ini

@@ -230,6 +230,7 @@ scheme=https
 [test_sharedWorker_ports.html]
 [test_sharedWorker_lifetime.html]
 [test_fileReader.html]
+skip-if = !debug # bug 1400098
 [test_navigator_workers_hardwareConcurrency.html]
 [test_bug1278777.html]
 [test_setTimeoutWith0.html]

gfx/layers/apz/test/mochitest/mochitest.ini

@@ -50,6 +50,7 @@
 [test_group_mouseevents.html]
   skip-if = (toolkit == 'android') # mouse events not supported on mobile
 [test_group_pointerevents.html]
+skip-if = os == 'win' && os_version == '10.0' # Bug 1404836
 [test_group_touchevents.html]
 [test_group_wheelevents.html]
   skip-if = (toolkit == 'android') # wheel events not supported on mobile

testing/web-platform/meta/html/browsers/windows/browsing-context-names/choose-_parent-001.html.ini

@@ -0,0 +1,4 @@
+[choose-_parent-001.html]
+  type: testharness
+  disabled: if os != "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1403428
+

uriloader/exthandler/tests/mochitest/browser.ini

@@ -10,5 +10,6 @@ support-files =
 skip-if = !e10s # test relies on e10s behavior
 [browser_download_always_ask_preferred_app.js]
 [browser_ext_helper_pb.js]
+skip-if = os == "mac" # bug 1396184
 [browser_remember_download_option.js]
 [browser_web_protocol_handlers.js]