merge mozilla-inbound to mozilla-central. r=merge a=merge
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sun, 15 Oct 2017 23:43:07 +0200
changeset 680630 2ba9ba4fa63b942d8d9401f6ff6e40f5730adcd1
parent 680629 2b72da4695e8c58bd2142044ffece1b0f394f53b (current diff)
parent 680612 33762f821b9cb3aaedad9a9fda64c44e5509434e (diff)
child 680631 378a478e5c1b802669d5fa11352355c4090cdd29
child 680636 23f18c66f4bf11f9bc93ca0e13f6f6af185895e9
child 680637 a90b07067b56eb6fa32b9707db8c49863612ec96
child 680639 469ccbf9e091416fbca799d016e17224edd8a141
child 680642 92d392138c47480e09f2bcccdb5c162d82c0ab9c
child 680643 7152e5eada6b36d2b6df33ee8c8c6cefa8ddcda0
child 680645 b12ce6c416af93dc0ac774c2074142afc8a3c0f8
child 680647 e32ea915cbaacded2a973fc1c41c03b4dc623921
child 680677 e4504045e0269316193d0cff5ba93c0dafd7db22
child 680681 d829a6ccde9fb409e5737f97b275caa521379799
child 680682 0ce17a3de48698ccef9129756c5e7604c9e1ca42
child 680683 a76b37eadd7b33c32bebd5ccebfaffeda7c2ea1e
child 680685 de0cc06f009d2d22289881adfbfc61997f4f1fcd
child 680690 7830d23b74762f92aa5812969f0e48f01270fe24
child 680700 b2bb5fc1cdee7fe32223939dea8282039bd6176a
child 680706 b960ec2ac90018f87a381ffeff19d4b94a7b85af
child 680707 4d48aab3c58671487e0aaf5cdb051599924e3106
child 680708 06a17c662af27cbb7133a1867e514ebe88fb7260
child 680720 3089481921e9d615f535e644ed010781a6a8af70
child 680723 66cdb2c29d29e4d556077f17fe80b64b477d7374
child 680725 717927fbd8b310ffcaee6a12051f6cd0385412cc
child 680728 53ce0e22adeed13adb396da085a25038529b8e7b
child 680736 cc4fcc903e7b003444467131b55eea261ad385f8
child 680739 de72780d73103460ceeb55d895434d940b7f7f71
child 680740 0d02ebb981b3cc1e71e08ccc84a6bbd0f294281c
child 680742 11fa8db8dc200f272f31b9ad9b0a977573eeabdc
child 680746 0856a2ff37379a000e23cf47d95afb0c3df94c57
child 680766 414400dccb126eab4d8b66603535040771809a24
child 680786 1417833c6b3e4d7d0c33e93228c8abc6e5080cba
child 680793 4aba70e16009114f1ca75f915b25a27c744a28c9
child 680801 041c2f00e50b7ec48d354502b7e767302983804d
child 680803 c78ded2fa9563c8fc5daa7a005ca6d1b21312ca9
child 681149 bd1fc82d1e01a304e643fb5215e68e1b15fd4c0f
child 681153 56c4ea272080e7583cbf3874f542b020f1b5faae
child 681166 0fe43bfe3df6bba029843646c5a7dc9c93a9fe7c
child 681343 03b4a7666f560d99ddc1ec937b9e32c31db0f30e
child 681351 0ace2dd73dfb5b9f5a559abb175a4b9d954e9342
child 681355 c4a5881ee873f3bef797df233de9927ac60b6625
child 681357 ad3c4a08256a1714fa871db0762d22f3dd35cb13
child 681373 5a93e6f25184b77829dc04e10951989019ee16c7
child 681374 0d3723a0c658f555293ee5a514d0745856b51bfc
child 681378 988359b113f33c7c8a427a2e4a2d96e00ffa0575
child 681391 b1c40c4df18e060c72499330b5ed8016656e7c1a
child 681679 8f8335fd3735a32fdcd98da237d07871af30015e
child 681936 ad33c23016e900eb12048a6ecd81c2e3824af52e
child 681943 ebd22c81ab66b34ba74ad20cde374ef479c592d5
child 685264 8e790c5c8f48fc6f2f808eec476f737d25d20999
child 685284 32087d614a43d66420475ccbea2336413fd0ac87
child 685287 0962a4d6631f1c0989d3f9f0bb452c2a8d34826c
child 685852 beb5415e5eb1e528e06832495ec4209770c37d5f
child 685858 c0f7915a7fa1c5a593e734bc2d9ff46b996a0105
child 685998 fcd541a42f35bfec2478ede7878b0f962206fde9
child 687380 c4096e13fcf952ccbeef5a59cc111f575266bc15
child 687418 8cd77123126ca79d3df25d376003aedae1418847
child 687422 90a36a3408f4beda9c40f4a19a1ccf641ccfbfb4
child 687427 7e81c1b742b6af915d3d7cf1e40c3df38d4be29e
push id84566
push userbmo:ayang@mozilla.com
push dateMon, 16 Oct 2017 00:30:33 +0000
reviewersmerge, merge
milestone58.0a1
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]