Backed out changeset b776171d854c (bug 1515103) for browser_Troubleshoot.js failures CLOSED TREE

gfx/thebes/gfxPlatform.cpp

@@ -3142,14 +3142,6 @@ void gfxPlatform::NotifyFrameStats(nsTArray<FrameStats>&& aFrameStats) {
   }
 }
 
-/*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)

gfx/thebes/gfxPlatform.h

@@ -755,8 +755,6 @@ class gfxPlatform : public mozilla::layers::MemoryPressureListener {
   virtual void EnsureDevicesInitialized(){};
   virtual bool DevicesInitialized() { return true; };
 
-  static uint32_t TargetFrameRate();
-
  protected:
   gfxPlatform();
   virtual ~gfxPlatform();

toolkit/components/telemetry/app/TelemetryEnvironment.jsm

@@ -1695,7 +1695,6 @@ EnvironmentCache.prototype = {
       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),

toolkit/content/aboutSupport.js

@@ -453,8 +453,6 @@ var snapshotFormatters = {
       "contentUsesTiling",
       "offMainThreadPaintEnabled",
       "offMainThreadPaintWorkerCount",
-      "lowEndMachine",
-      "targetFrameRate",
     ];
     for (let feature of featureKeys) {
       if (Array.isArray(feature)) {

toolkit/content/aboutSupport.xhtml

@@ -321,6 +321,9 @@
           </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"/>

toolkit/locales/en-US/toolkit/about/aboutSupport.ftl

@@ -237,8 +237,6 @@ 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

toolkit/modules/Troubleshoot.jsm

@@ -425,8 +425,6 @@ var dataProviders = {
       ContentUsesTiling: "contentUsesTiling",
       OffMainThreadPaintEnabled: "offMainThreadPaintEnabled",
       OffMainThreadPaintWorkerCount: "offMainThreadPaintWorkerCount",
-      LowEndMachine: "lowEndMachine",
-      TargetFrameRate: "targetFrameRate",
     };
 
     for (let prop in gfxInfoProps) {

widget/GfxInfoBase.cpp

@@ -1458,18 +1458,6 @@ GfxInfoBase::GetOffMainThreadPaintWorkerCount(
   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();

widget/GfxInfoBase.h

@@ -73,8 +73,6 @@ class GfxInfoBase : public nsIGfxInfo,
       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.

widget/nsIGfxInfo.idl

@@ -29,8 +29,6 @@ interface nsIGfxInfo : nsISupports
   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.