merge m-c to m-i to fix perma failures

2016-04-05 10:34:05 +02:00 · 2016-04-05 10:34:05 +02:00 · 93f1ed4229
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@ -298,6 +298,7 @@ pref("ui.dragThresholdY", 25);

 // Layers Acceleration.  We can only have nice things on gonk, because
 // they're not maintained anywhere else.
+pref("layers.offmainthreadcomposition.enabled", true);
 #ifndef MOZ_WIDGET_GONK
 pref("dom.ipc.tabs.disabled", true);
 #else
--- a/b2g/components/OopCommandLine.js
+++ b/b2g/components/OopCommandLine.js
@ -26,6 +26,7 @@ oopCommandlineHandler.prototype = {
                // environment
                branch.setBoolPref("dom.ipc.tabs.disabled", false);
                branch.setBoolPref("layers.acceleration.disabled", false);
+                branch.setBoolPref("layers.offmainthreadcomposition.enabled", true);
                branch.setBoolPref("layers.offmainthreadcomposition.async-animations", true);
                branch.setBoolPref("layers.async-video.enabled", true);
                branch.setBoolPref("layers.async-pan-zoom.enabled", true);
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@ -3867,10 +3867,10 @@ function OpenBrowserWindow(options)
  if (options && options.remote) {
    // If we're using remote tabs by default, then OMTC will be force-enabled,
    // despite the preference returning as false.
-    let omtcEnabled = !gPrefService.getBoolPref("layers.offmainthreadcomposition.force-disabled")
+    let omtcEnabled = gPrefService.getBoolPref("layers.offmainthreadcomposition.enabled")
                      || Services.appinfo.browserTabsRemoteAutostart;
    if (!omtcEnabled) {
-      alert("To use out-of-process tabs, you must unset the layers.offmainthreadcomposition.force-disabled preference and restart. Opening a normal window instead.");
+      alert("To use out-of-process tabs, you must set the layers.offmainthreadcomposition.enabled preference and restart. Opening a normal window instead.");
    } else {
      extraFeatures += ",remote";
    }
--- a/gfx/gl/GLLibraryEGL.cpp
+++ b/gfx/gl/GLLibraryEGL.cpp
@ -161,7 +161,7 @@ GetAndInitDisplayForAccelANGLE(GLLibraryEGL& egl)
    // D3D11 ANGLE only works with OMTC; there's a bug in the non-OMTC layer
    // manager, and it's pointless to try to fix it.  We also don't try
    // D3D11 ANGLE if the layer manager is prefering D3D9 (hrm, do we care?)
-    if (!gfxPrefs::LayersOffMainThreadCompositionForceDisabled() &&
+    if (gfxPrefs::LayersOffMainThreadCompositionEnabled() &&
        !gfxPrefs::LayersPreferD3D9())
    {
        if (gfxPrefs::WebGLANGLEForceD3D11())
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@ -599,12 +599,13 @@ gfxPlatform::Init()
                               gfxPrefs::Direct2DForceEnabled(),
                               gfxPrefs::DirectWriteFontRenderingForceEnabled());
      // Layers prefs
-      forcedPrefs.AppendPrintf("-L%d%d%d%d%d",
+      forcedPrefs.AppendPrintf("-L%d%d%d%d%d%d",
                               gfxPrefs::LayersAMDSwitchableGfxEnabled(),
                               gfxPrefs::LayersAccelerationDisabled(),
                               gfxPrefs::LayersAccelerationForceEnabled(),
                               gfxPrefs::LayersD3D11DisableWARP(),
-                               gfxPrefs::LayersD3D11ForceWARP());
+                               gfxPrefs::LayersD3D11ForceWARP(),
+                               gfxPrefs::LayersOffMainThreadCompositionForceEnabled());
      // WebGL prefs
      forcedPrefs.AppendPrintf("-W%d%d%d%d%d%d%d%d",
                               gfxPrefs::WebGLANGLEForceD3D11(),
@ -2219,7 +2220,8 @@ gfxPlatform::UsesOffMainThreadCompositing()
  if (firstTime) {
    result =
      sPrefBrowserTabsRemoteAutostart ||
-      !gfxPrefs::LayersOffMainThreadCompositionForceDisabled();
+      gfxPrefs::LayersOffMainThreadCompositionEnabled() ||
+      gfxPrefs::LayersOffMainThreadCompositionForceEnabled();
 #if defined(MOZ_WIDGET_GTK)
    // Linux users who chose OpenGL are being grandfathered in to OMTC
    result |= gfxPrefs::LayersAccelerationForceEnabled();
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@ -369,7 +369,8 @@ private:
  DECL_GFX_PREF(Live, "layers.low-precision-opacity",          LowPrecisionOpacity, float, 1.0f);
  DECL_GFX_PREF(Live, "layers.low-precision-resolution",       LowPrecisionResolution, float, 0.25f);
  DECL_GFX_PREF(Live, "layers.max-active",                     MaxActiveLayers, int32_t, -1);
-  DECL_GFX_PREF(Once, "layers.offmainthreadcomposition.force-disabled", LayersOffMainThreadCompositionForceDisabled, bool, false);
+  DECL_GFX_PREF(Once, "layers.offmainthreadcomposition.enabled", LayersOffMainThreadCompositionEnabled, bool, false);
+  DECL_GFX_PREF(Once, "layers.offmainthreadcomposition.force-enabled", LayersOffMainThreadCompositionForceEnabled, bool, false);
  DECL_GFX_PREF(Live, "layers.offmainthreadcomposition.frame-rate", LayersCompositionFrameRate, int32_t,-1);
  DECL_GFX_PREF(Live, "layers.orientation.sync.timeout",       OrientationSyncMillis, uint32_t, (uint32_t)0);
  DECL_GFX_PREF(Once, "layers.overzealous-gralloc-unlocking",  OverzealousGrallocUnlocking, bool, false);
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@ -580,6 +580,7 @@ pref("ui.dragThresholdX", 25);
 pref("ui.dragThresholdY", 25);

 pref("layers.acceleration.disabled", false);
+pref("layers.offmainthreadcomposition.enabled", true);
 pref("layers.async-video.enabled", true);

 #ifdef MOZ_ANDROID_APZ
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@ -4422,6 +4422,8 @@ pref("layers.max-active", -1);
 // if you change the tile size.
 pref("layers.tiles.adjust", true);

+// Set the default values, and then override per-platform as needed
+pref("layers.offmainthreadcomposition.enabled", true);
 // Compositor target frame rate. NOTE: If vsync is enabled the compositor
 // frame rate will still be capped.
 // -1 -> default (match layout.frame_rate or 60 FPS)
--- a/testing/docker/centos6-build-upd/Dockerfile
+++ b/testing/docker/centos6-build-upd/Dockerfile
@ -1,4 +1,4 @@
-FROM          taskcluster/centos6-build:0.1.6
+FROM          taskcluster/centos6-build:0.1.5
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>

 ### update to latest from upstream repositories
--- a/testing/docker/centos6-build-upd/VERSION
+++ b/testing/docker/centos6-build-upd/VERSION
@ -1 +1 @@
-0.1.6.20160329195300
+0.1.5.20160323120600
--- a/testing/docker/centos6-build/VERSION
+++ b/testing/docker/centos6-build/VERSION
@ -1 +1 @@
-0.1.6
+0.1.5
--- a/testing/docker/centos6-build/system-setup.sh
+++ b/testing/docker/centos6-build/system-setup.sh
@ -421,8 +421,8 @@ cat >requirements.txt <<'EOF'
 # sha256: 90pZQ6kAXB6Je8-H9-ivfgDAb6l3e5rWkfafn6VKh9g
 virtualenv==13.1.2

-# sha256: wJnELXTi1SC2HdNyzZlrD6dgXAZheDT9exPHm5qaWzA
-mercurial==3.7.3
+# sha256: W6lDjWqw25P3sHhrpjITjrZKncDZPjDd4rF7Mo_cbXo
+mercurial==3.7.2
 EOF
 peep install -r requirements.txt

--- a/testing/docker/desktop-build/Dockerfile
+++ b/testing/docker/desktop-build/Dockerfile
@ -1,4 +1,4 @@
-FROM          taskcluster/centos6-build-upd:0.1.6.20160329195300
+FROM          taskcluster/centos6-build-upd:0.1.5.20160323120600
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>

 # Add build scripts; these are the entry points from the taskcluster worker, and
--- a/testing/docker/desktop-test/Dockerfile
+++ b/testing/docker/desktop-test/Dockerfile
@ -1,4 +1,4 @@
-FROM          taskcluster/ubuntu1204-test-upd:0.1.9.20160329211700
+FROM          taskcluster/ubuntu1204-test-upd:0.1.8.20160218152601
 MAINTAINER    Jonas Finnemann Jensen <jopsen@gmail.com>

 # Add utilities and configuration
--- a/testing/docker/ubuntu1204-test-upd/Dockerfile
+++ b/testing/docker/ubuntu1204-test-upd/Dockerfile
@ -1,4 +1,4 @@
-FROM          taskcluster/ubuntu1204-test:0.1.9
+FROM          taskcluster/ubuntu1204-test:0.1.8
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>

 ### update to latest from upstream repositories
--- a/testing/docker/ubuntu1204-test-upd/VERSION
+++ b/testing/docker/ubuntu1204-test-upd/VERSION
@ -1 +1 @@
-0.1.9.20160329211700
+0.1.8.20160218152601
--- a/testing/docker/ubuntu1204-test/VERSION
+++ b/testing/docker/ubuntu1204-test/VERSION
@ -1 +1 @@
-0.1.9
+0.1.8
--- a/testing/docker/ubuntu1204-test/system-setup.sh
+++ b/testing/docker/ubuntu1204-test/system-setup.sh
@ -155,8 +155,8 @@ cat >requirements.txt <<'EOF'
 # sha256: qryO8YzdvYoqnH-SvEPi_qVLEUczDWXbkg7zzpgS49w
 virtualenv==13.1.2

-# sha256: wJnELXTi1SC2HdNyzZlrD6dgXAZheDT9exPHm5qaWzA
-mercurial==3.7.3
+# sha256: tQ9peOfTn-DLKY-j-j6c5B0jVnIdFV5SiPnFfl8T6ac
+mercurial==3.5
 EOF
 peep install -r requirements.txt

--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@ -196,6 +196,11 @@ config = {
                        "--setpref=layers.acceleration.disabled=true"],
            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
        },
+        "reftest-omtc": {
+            "options": ["--suite=reftest",
+                        "--setpref=layers.offmainthreadcomposition.enabled=true"],
+            "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
+        },
        "crashtest-ipc": {
            "options": ["--suite=crashtest",
                        '--setpref=browser.tabs.remote=true',
--- a/toolkit/components/telemetry/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm
@ -146,7 +146,7 @@ const DEFAULT_ENVIRONMENT_PREFS = new Map([
  ["layers.componentalpha.enabled", {what: RECORD_PREF_VALUE}],
  ["layers.d3d11.disable-warp", {what: RECORD_PREF_VALUE}],
  ["layers.d3d11.force-warp", {what: RECORD_PREF_VALUE}],
-  ["layers.offmainthreadcomposition.force-disabled", {what: RECORD_PREF_VALUE}],
+  ["layers.offmainthreadcomposition.enabled", {what: RECORD_PREF_VALUE}],
  ["layers.prefer-d3d9", {what: RECORD_PREF_VALUE}],
  ["layers.prefer-opengl", {what: RECORD_PREF_VALUE}],
  ["layout.css.devPixelsPerPx", {what: RECORD_PREF_VALUE}],
 @ -1 +1 @@
 .1.6
 .1.5
 @ -1 +1 @@
 .1.9
 .1.8