merge mozilla-inbound to mozilla-central. r=merge a=merge
merge mozilla-inbound to mozilla-central. r=merge a=merge
MozReview-Commit-ID: TaCJmNGpct
--- a/browser/components/search/test/browser.ini
+++ b/browser/components/search/test/browser.ini
@@ -19,16 +19,17 @@ support-files =
[browser_addEngine.js]
[browser_amazon.js]
[browser_bing.js]
[browser_contextmenu.js]
[browser_contextSearchTabPosition.js]
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]
skip-if = artifact # bug 1315953
[browser_google_nocodes.js]
skip-if = artifact # bug 1315953
[browser_google_behavior.js]
skip-if = artifact # bug 1315953
--- a/dom/html/HTMLTrackElement.cpp
+++ b/dom/html/HTMLTrackElement.cpp
@@ -63,17 +63,17 @@ static constexpr nsAttrValue::EnumTable
{ "descriptions", static_cast<int16_t>(TextTrackKind::Descriptions) },
{ "chapters", static_cast<int16_t>(TextTrackKind::Chapters) },
{ "metadata", static_cast<int16_t>(TextTrackKind::Metadata) },
{ nullptr, 0 }
};
// 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
{
NS_DECL_ISUPPORTS
public:
explicit WindowDestroyObserver(HTMLTrackElement* aElement, uint64_t aWinID)
: mTrackElement(aElement)
--- a/dom/media/webrtc/WebrtcGlobal.h
+++ b/dom/media/webrtc/WebrtcGlobal.h
@@ -23,17 +23,17 @@ struct ParamTraits<mozilla::dom::Sequenc
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, static_cast<const FallibleTArray<T>&>(aParam));
}
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));
}
};
template<>
struct ParamTraits<mozilla::dom::RTCStatsType> :
public ContiguousEnumSerializer<
mozilla::dom::RTCStatsType,
mozilla::dom::RTCStatsType::Inbound_rtp,
--- a/dom/workers/test/mochitest.ini
+++ b/dom/workers/test/mochitest.ini
@@ -225,15 +225,16 @@ skip-if = toolkit == 'android' #bug 9828
scheme=https
[test_workersDisabled.html]
[test_referrer.html]
[test_referrer_header_worker.html]
[test_importScripts_3rdparty.html]
[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]
[test_bug1301094.html]
[test_subworkers_suspended.html]
skip-if = toolkit == 'android' #bug 1366501
[test_bug1317725.html]
--- a/gfx/layers/apz/test/mochitest/mochitest.ini
+++ b/gfx/layers/apz/test/mochitest/mochitest.ini
@@ -45,16 +45,17 @@
[test_bug1277814.html]
skip-if = (os == 'android') # wheel events not supported on mobile
[test_bug1304689.html]
[test_bug1304689-2.html]
[test_frame_reconstruction.html]
[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
[test_group_zoom.html]
skip-if = (toolkit != 'android') # only android supports zoom
[test_interrupted_reflow.html]
[test_key_scroll.html]
[test_layerization.html]
new file mode 100644
--- /dev/null
+++ b/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
+
--- a/uriloader/exthandler/tests/mochitest/browser.ini
+++ b/uriloader/exthandler/tests/mochitest/browser.ini
@@ -5,10 +5,11 @@ support-files =
download_page.html
download.bin
protocolHandler.html
[browser_auto_close_window.js]
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]