Merge mozilla-inbound to mozilla-central. a=merge
authorDaniel Varga <dvarga@mozilla.com>
Tue, 25 Jun 2019 00:35:29 +0300
changeset 542789 15984bd142b7ae1df1c10f4f572c8a37bac74b32
parent 542785 4a415941bef62b74389de9520e60fc7cc5cf3962 (current diff)
parent 542788 60c8d0cdd443bad2f5c840196ea3a99ba45c28c1 (diff)
child 542790 897742f4ae26de4afcba603082ac04e833b14b1a
child 542812 a5af8b04d7142774f69251a09a07444b81bf1ea0
child 542831 affad0f5479bee8f2e29bdc47283bae38abdd353
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone69.0a1
first release with
nightly linux32
15984bd142b7 / 69.0a1 / 20190624213657 / files
nightly linux64
15984bd142b7 / 69.0a1 / 20190624213657 / files
nightly mac
15984bd142b7 / 69.0a1 / 20190624213657 / files
nightly win32
15984bd142b7 / 69.0a1 / 20190624213657 / files
nightly win64
15984bd142b7 / 69.0a1 / 20190624213657 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-inbound to mozilla-central. a=merge
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -1937,16 +1937,21 @@ void nsJSContext::RunNextCollectorTimer(
 
 // static
 void nsJSContext::MaybeRunNextCollectorSlice(nsIDocShell* aDocShell,
                                              JS::GCReason aReason) {
   if (!aDocShell || !XRE_IsContentProcess()) {
     return;
   }
 
+  // Only do this if there is an incremental collection active.
+  if (!sInterSliceGCRunner && !sICCRunner) {
+    return;
+  }
+
   nsCOMPtr<nsIDocShellTreeItem> root;
   aDocShell->GetSameTypeRootTreeItem(getter_AddRefs(root));
   if (root == aDocShell) {
     // We don't want to run collectors when loading the top level page.
     return;
   }
 
   Document* rootDocument = root->GetDocument();
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -2647,17 +2647,24 @@ static FeatureState& WebRenderHardwareQu
               (deviceID >= 0x6700 && deviceID < 0x6720) ||
               (deviceID >= 0x6780 && deviceID < 0x6840) ||
               (deviceID >= 0x6860 && deviceID < 0x6880) ||
               (deviceID >= 0x6900 && deviceID < 0x6a00) ||
               (deviceID == 0x7300) ||
               (deviceID >= 0x9830 && deviceID < 0x9870) ||
               (deviceID >= 0x9900 && deviceID < 0x9a00)) {
             // we have a desktop CAYMAN, SI, CIK, VI, or GFX9 device
-            // so treat the device as qualified.
+            // so treat the device as qualified unless it is not Windows
+            // and not nightly.
+#if !defined(XP_WIN) && !defined(NIGHTLY_BUILD)
+            featureWebRenderQualified.Disable(
+                FeatureStatus::BlockedReleaseChannelAMD,
+                "Release channel and AMD",
+                NS_LITERAL_CSTRING("FEATURE_FAILURE_RELEASE_CHANNEL_AMD"));
+#endif  // !XPWIN && !NIGHTLY_BUILD
           } else {
             featureWebRenderQualified.Disable(
                 FeatureStatus::BlockedDeviceTooOld, "Device too old",
                 NS_LITERAL_CSTRING("FEATURE_FAILURE_DEVICE_TOO_OLD"));
           }
         } else if (adapterVendorID == u"0x8086") {  // Intel
           const uint16_t supportedDevices[] = {
               // skylake gt2+