Merge inbound to mozilla-central. a=merge
authorBrindusan Cristian <cbrindusan@mozilla.com>
Mon, 07 Jan 2019 18:43:04 +0200
changeset 509812 3b6cfb4b1e57165bc787d76123b036df299d368e
parent 509806 17ae2e56509f21aadf30d839235ecac424108871 (current diff)
parent 509811 7814dee9683a53a14259a3ca30d1639b14eb87c6 (diff)
child 509822 1ae462ea62d760a6a36e7709dd2b1cd748da7b14
child 509842 0153780b0a346f828b2f235f63bf796490594493
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to mozilla-central. a=merge
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -910,17 +910,17 @@ tags=msg
 skip-if = android_version == '17' # android(bug 1232305)
 tags=msg
 [test_mediarecorder_pause_resume_video.html]
 skip-if = toolkit == 'android' # android(bug 1232305)
 [test_mediarecorder_playback_can_repeat.html]
 skip-if = android_version == '17' || android_version == '22' # android(bug 1232305, bug 1372457)
 tags=msg
 [test_mediarecorder_principals.html]
-skip-if = toolkit == 'android' # android(bug 1232305)
+skip-if = toolkit == 'android' || (os == 'win' && os_version == '10.0' && webrender) # android(bug 1232305), Bug 1453375
 tags=msg
 [test_mediarecorder_record_4ch_audiocontext.html]
 skip-if = android_version == '17' # android(bug 1232305)
 tags=msg
 [test_mediarecorder_record_addtracked_stream.html]
 skip-if = toolkit == 'android' # Bug 1408241
 tags=msg capturestream
 [test_mediarecorder_record_audiocontext.html]
--- a/dom/payments/test/mochitest.ini
+++ b/dom/payments/test/mochitest.ini
@@ -35,17 +35,17 @@ skip-if = debug # Bug 1507251 - Leak
 skip-if = e10s # Bug 1408250: Don't expose PaymentRequest Constructor in non-e10s
 [test_bug1478740.html]
 [test_bug1490698.html]
 [test_canMakePayment.html]
 run-if = nightly_build # Bug 1390737: Depends on the Nightly-only UI service
 skip-if = debug # Bug 1507251 - Leak
 [test_closePayment.html]
 [test_constructor.html]
-skip-if = (os == "linux") # Bug 1514425
+skip-if = (os == "linux") || (os == "mac") || (os == "win" && os_version == "10.0") # Bug 1514425
 [test_currency_amount_validation.html]
 skip-if = (verify && debug)
 [test_payerDetails.html]
 [test_payment-request-in-iframe.html]
 [test_pmi_validation.html]
 skip-if = (verify && debug)
 [test_requestShipping.html]
 [test_retryPayment.html]
--- a/layout/base/TouchManager.cpp
+++ b/layout/base/TouchManager.cpp
@@ -170,17 +170,18 @@ void TouchManager::EvictTouches() {
     --i;
     dom::Touch* touch = aEvent->mTouches[i];
     if (TouchManager::HasCapturedTouch(touch->Identifier())) {
       continue;
     }
 
     MOZ_ASSERT(touch->mOriginalTarget);
     nsCOMPtr<nsIContent> targetContent = do_QueryInterface(touch->GetTarget());
-    nsIFrame* targetFrame = targetContent->GetPrimaryFrame();
+    nsIFrame* targetFrame =
+        targetContent ? targetContent->GetPrimaryFrame() : nullptr;
     if (targetFrame && !anyTarget) {
       anyTarget = targetContent;
     } else {
       nsIFrame* newTargetFrame = nullptr;
       for (nsIFrame* f = targetFrame; f;
            f = nsLayoutUtils::GetParentOrPlaceholderForCrossDoc(f)) {
         if (f->PresContext()->Document() == anyTarget->OwnerDoc()) {
           newTargetFrame = f;
--- a/testing/web-platform/meta/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html.ini
+++ b/testing/web-platform/meta/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html.ini
@@ -1,4 +1,3 @@
 [opener-setter.html]
   disabled:
-    if os == 'linux' and bits == 32: https://bugzilla.mozilla.org/show_bug.cgi?id=1483696
-    if os == 'linux' and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1483696
+    if os == 'linux' and bits == 32 and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1483696