Backed out changeset b776171d854c (bug 1515103) for browser_Troubleshoot.js failures CLOSED TREE
authorBogdan Tara <btara@mozilla.com>
Mon, 07 Jan 2019 22:28:59 +0200
changeset 509855 837890ad49682f6fe582c748f3e5ba79c387d0fd
parent 509854 bfd9ddf7b03b2d0a05f61a1bb9308639dbf0a2f4
child 509856 6ce5f09669e3e554b3e77d0d1a1e0c27bcdc8208
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)
bugs1515103
milestone66.0a1
backs outb776171d854c35104b3ba19f2beb55f484ddf0c1
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
Backed out changeset b776171d854c (bug 1515103) for browser_Troubleshoot.js failures CLOSED TREE
gfx/thebes/gfxPlatform.cpp
gfx/thebes/gfxPlatform.h
toolkit/components/telemetry/app/TelemetryEnvironment.jsm
toolkit/content/aboutSupport.js
toolkit/content/aboutSupport.xhtml
toolkit/locales/en-US/toolkit/about/aboutSupport.ftl
toolkit/modules/Troubleshoot.jsm
widget/GfxInfoBase.cpp
widget/GfxInfoBase.h
widget/nsIGfxInfo.idl
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -3137,24 +3137,16 @@ void gfxPlatform::NotifyFrameStats(nsTAr
   for (FrameStats& f : aFrameStats) {
     mFrameStats.InsertElementSorted(f, comp);
   }
   if (mFrameStats.Length() > 10) {
     mFrameStats.SetLength(10);
   }
 }
 
-/*static*/ uint32_t gfxPlatform::TargetFrameRate() {
-  if (gPlatform && gPlatform->mVsyncSource) {
-    VsyncSource::Display& display = gPlatform->mVsyncSource->GetGlobalDisplay();
-    return round(1000.0 / display.GetVsyncRate().ToMilliseconds());
-  }
-  return 0;
-}
-
 /*static*/ bool gfxPlatform::AsyncPanZoomEnabled() {
 #if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_UIKIT)
   // For XUL applications (everything but Firefox on Android)
   // we only want to use APZ when E10S is enabled. If
   // we ever get input events off the main thread we can consider relaxing
   // this requirement.
   if (!BrowserTabsRemoteAutostart()) {
     return false;
--- a/gfx/thebes/gfxPlatform.h
+++ b/gfx/thebes/gfxPlatform.h
@@ -750,18 +750,16 @@ class gfxPlatform : public mozilla::laye
   void NotifyFrameStats(nsTArray<mozilla::layers::FrameStats>&& aFrameStats);
 
   virtual void OnMemoryPressure(
       mozilla::layers::MemoryPressureReason aWhy) override;
 
   virtual void EnsureDevicesInitialized(){};
   virtual bool DevicesInitialized() { return true; };
 
-  static uint32_t TargetFrameRate();
-
  protected:
   gfxPlatform();
   virtual ~gfxPlatform();
 
   virtual bool HasBattery() { return true; }
 
   virtual void InitAcceleration();
   virtual void InitWebRenderConfig();
--- a/toolkit/components/telemetry/app/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/app/TelemetryEnvironment.jsm
@@ -1690,17 +1690,16 @@ EnvironmentCache.prototype = {
    * Get the GFX information.
    * @return Object containing the GFX data.
    */
   _getGFXData() {
     let gfxData = {
       D2DEnabled: getGfxField("D2DEnabled", null),
       DWriteEnabled: getGfxField("DWriteEnabled", null),
       ContentBackend: getGfxField("ContentBackend", null),
-      LowEndMachine: getGfxField("LowEndMachine", false),
       // The following line is disabled due to main thread jank and will be enabled
       // again as part of bug 1154500.
       // DWriteVersion: getGfxField("DWriteVersion", null),
       adapters: [],
       monitors: [],
       features: {},
     };
 
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -448,18 +448,16 @@ var snapshotFormatters = {
       "webgl2DriverExtensions",
       "webgl2Extensions",
       ["supportsHardwareH264", "hardware-h264"],
       ["direct2DEnabled", "#Direct2D"],
       "usesTiling",
       "contentUsesTiling",
       "offMainThreadPaintEnabled",
       "offMainThreadPaintWorkerCount",
-      "lowEndMachine",
-      "targetFrameRate",
     ];
     for (let feature of featureKeys) {
       if (Array.isArray(feature)) {
         await addRowFromKey("features", feature[0], feature[1]);
         continue;
       }
       await addRowFromKey("features", feature);
     }
--- a/toolkit/content/aboutSupport.xhtml
+++ b/toolkit/content/aboutSupport.xhtml
@@ -316,16 +316,19 @@
 
       <table>
         <tbody id="graphics-features-tbody">
           <tr>
             <th colspan="2" class="title-column" data-l10n-id="graphics-features-title"/>
           </tr>
         </tbody>
 
+        <tbody id="graphics-tbody">
+        </tbody>
+
         <tbody id="graphics-gpu-1-tbody">
           <tr>
             <th colspan="2" class="title-column" data-l10n-id="graphics-gpu1-title"/>
           </tr>
         </tbody>
 
         <tbody id="graphics-gpu-2-tbody">
           <tr>
--- a/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl
+++ b/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl
@@ -232,18 +232,16 @@ glcontext-crash-guard = OpenGL
 reset-on-next-restart = Reset on Next Restart
 gpu-process-kill-button = Terminate GPU Process
 gpu-device-reset = Device Reset
 gpu-device-reset-button = Trigger Device Reset
 uses-tiling = Uses Tiling
 content-uses-tiling = Uses Tiling (Content)
 off-main-thread-paint-enabled = Off Main Thread Painting Enabled
 off-main-thread-paint-worker-count = Off Main Thread Painting Worker Count
-low-end-machine = Detected less performant machine
-target-frame-rate = Target Frame Rate
 
 audio-backend = Audio Backend
 max-audio-channels = Max Channels
 channel-layout = Preferred Channel Layout
 sample-rate = Preferred Sample Rate
 
 min-lib-versions = Expected minimum version
 loaded-lib-versions = Version in use
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -420,18 +420,16 @@ var dataProviders = {
       D2DEnabled: "direct2DEnabled",
       DWriteEnabled: "directWriteEnabled",
       DWriteVersion: "directWriteVersion",
       cleartypeParameters: "clearTypeParameters",
       UsesTiling: "usesTiling",
       ContentUsesTiling: "contentUsesTiling",
       OffMainThreadPaintEnabled: "offMainThreadPaintEnabled",
       OffMainThreadPaintWorkerCount: "offMainThreadPaintWorkerCount",
-      LowEndMachine: "lowEndMachine",
-      TargetFrameRate: "targetFrameRate",
     };
 
     for (let prop in gfxInfoProps) {
       try {
         data[gfxInfoProps[prop] || prop] = gfxInfo[prop];
       } catch (e) {}
     }
 
--- a/widget/GfxInfoBase.cpp
+++ b/widget/GfxInfoBase.cpp
@@ -1454,28 +1454,16 @@ GfxInfoBase::GetOffMainThreadPaintWorker
         layers::PaintThread::CalculatePaintWorkerCount();
   } else {
     *aOffMainThreadPaintWorkerCount = 0;
   }
   return NS_OK;
 }
 
 NS_IMETHODIMP
-GfxInfoBase::GetLowEndMachine(bool* aLowEndMachine) {
-  *aLowEndMachine = gfxPlatform::ShouldAdjustForLowEndMachine();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-GfxInfoBase::GetTargetFrameRate(uint32_t* aTargetFrameRate) {
-  *aTargetFrameRate = gfxPlatform::TargetFrameRate();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 GfxInfoBase::GetIsHeadless(bool* aIsHeadless) {
   *aIsHeadless = gfxPlatform::IsHeadless();
   return NS_OK;
 }
 
 NS_IMETHODIMP
 GfxInfoBase::GetContentBackend(nsAString& aContentBackend) {
   BackendType backend = gfxPlatform::GetPlatform()->GetDefaultContentBackend();
--- a/widget/GfxInfoBase.h
+++ b/widget/GfxInfoBase.h
@@ -68,18 +68,16 @@ class GfxInfoBase : public nsIGfxInfo,
   NS_IMETHOD GetWebRenderEnabled(bool* aWebRenderEnabled) override;
   NS_IMETHOD GetIsHeadless(bool* aIsHeadless) override;
   NS_IMETHOD GetUsesTiling(bool* aUsesTiling) override;
   NS_IMETHOD GetContentUsesTiling(bool* aUsesTiling) override;
   NS_IMETHOD GetOffMainThreadPaintEnabled(
       bool* aOffMainThreadPaintEnabled) override;
   NS_IMETHOD GetOffMainThreadPaintWorkerCount(
       int32_t* aOffMainThreadPaintWorkerCount) override;
-  NS_IMETHOD GetLowEndMachine(bool* aLowEndMachine) override;
-  NS_IMETHOD GetTargetFrameRate(uint32_t* aTargetFrameRate) override;
 
   // Initialization function. If you override this, you must call this class's
   // version of Init first.
   // We need Init to be called separately from the constructor so we can
   // register as an observer after all derived classes have been constructed
   // and we know we have a non-zero refcount.
   // Ideally, Init() would be void-return, but the rules of
   // NS_GENERIC_FACTORY_CONSTRUCTOR_INIT require it be nsresult return.
--- a/widget/nsIGfxInfo.idl
+++ b/widget/nsIGfxInfo.idl
@@ -24,18 +24,16 @@ interface nsIGfxInfo : nsISupports
    */
   readonly attribute AString ContentBackend;
   readonly attribute boolean WebRenderEnabled;
   readonly attribute boolean isHeadless;
   readonly attribute boolean UsesTiling;
   readonly attribute boolean ContentUsesTiling;
   readonly attribute boolean OffMainThreadPaintEnabled;
   readonly attribute long OffMainThreadPaintWorkerCount;
-  readonly attribute boolean LowEndMachine;
-  readonly attribute unsigned long TargetFrameRate;
 
   // XXX: Switch to a list of devices, rather than explicitly numbering them.
 
   /**
    * The name of the display adapter.
    */
   readonly attribute AString adapterDescription;
   readonly attribute AString adapterDescription2;