bug 1175005: performance regression. backout_2dba54b89ec8
authorJoel Maher <jmaher@mozilla.com>
Thu, 09 Jul 2015 11:50:02 +0100
changeset 252034 ebeba19467c452100beeec4b3f83f9a5d1187977
parent 252033 ffe321737a9e7998cc8b4a8e323f47ec96d0eadc
child 252035 a2261cdab5b34fbb77669be68c94c258a827b27d
push id62045
push userjmaher@mozilla.com
push dateThu, 09 Jul 2015 10:54:42 +0000
treeherdermozilla-inbound@ebeba19467c4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1175005
milestone42.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
bug 1175005: performance regression. backout_2dba54b89ec8
widget/GfxInfoBase.cpp
widget/GfxInfoBase.h
widget/nsIGfxInfo.idl
--- a/widget/GfxInfoBase.cpp
+++ b/widget/GfxInfoBase.cpp
@@ -1158,30 +1158,16 @@ GfxInfoBase::RemoveCollector(GfxInfoColl
     }
   }
   if (sCollectors->IsEmpty()) {
     delete sCollectors;
     sCollectors = nullptr;
   }
 }
 
-NS_IMETHODIMP
-GfxInfoBase::GetMonitors(JSContext* aCx, JS::MutableHandleValue aResult)
-{
-  JS::Rooted<JSObject*> array(aCx, JS_NewArrayObject(aCx, 0));
-
-  nsresult rv = FindMonitors(aCx, array);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  aResult.setObject(*array);
-  return NS_OK;
-}
-
 GfxInfoCollectorBase::GfxInfoCollectorBase()
 {
   GfxInfoBase::AddCollector(this);
 }
 
 GfxInfoCollectorBase::~GfxInfoCollectorBase()
 {
   GfxInfoBase::RemoveCollector(this);
--- a/widget/GfxInfoBase.h
+++ b/widget/GfxInfoBase.h
@@ -49,18 +49,17 @@ public:
   // using GfxInfoBase::GetFeatureStatus;
   // using GfxInfoBase::GetFeatureSuggestedDriverVersion;
   // using GfxInfoBase::GetWebGLParameter;
   // to import the relevant methods into their namespace.
   NS_IMETHOD GetFeatureStatus(int32_t aFeature, int32_t *_retval) override;
   NS_IMETHOD GetFeatureSuggestedDriverVersion(int32_t aFeature, nsAString & _retval) override;
   NS_IMETHOD GetWebGLParameter(const nsAString & aParam, nsAString & _retval) override;
 
-  NS_IMETHOD GetMonitors(JSContext* cx, JS::MutableHandleValue _retval) override;
-  NS_IMETHOD GetFailures(uint32_t *failureCount, int32_t** indices, char ***failures) override;
+    NS_IMETHOD GetFailures(uint32_t *failureCount, int32_t** indices, char ***failures) override;
   NS_IMETHOD_(void) LogFailure(const nsACString &failure) override;
   NS_IMETHOD GetInfo(JSContext*, JS::MutableHandle<JS::Value>) 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.
--- a/widget/nsIGfxInfo.idl
+++ b/widget/nsIGfxInfo.idl
@@ -3,17 +3,17 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 
 /* NOTE: this interface is completely undesigned, not stable and likely to change */
 
-[scriptable, uuid(47eedfa0-f7cb-445b-b5cf-a2ca83600560)]
+[scriptable, uuid(b0cd9d34-8dba-4b1d-8126-ca21826dbf35)]
 interface nsIGfxInfo : nsISupports
 {
   /*
    * These are win32-specific
    */
   readonly attribute boolean D2DEnabled;
   readonly attribute boolean DWriteEnabled;
   readonly attribute DOMString DWriteVersion;
@@ -49,27 +49,16 @@ interface nsIGfxInfo : nsISupports
   readonly attribute DOMString adapterDriverVersion;
   readonly attribute DOMString adapterDriverVersion2;
   
   readonly attribute DOMString adapterDriverDate;
   readonly attribute DOMString adapterDriverDate2;
 
   readonly attribute boolean isGPU2Active;
 
-  /**
-   * Returns an array of objects describing each monitor. Guaranteed properties
-   * are "screenWidth" and "screenHeight". This is only implemented on Desktop.
-   *
-   * Windows additionally supplies "refreshRate" and "pseudoDisplay".
-   *
-   * OS X additionally supplies "scale".
-   */
-  [implicit_jscontext]
-  jsval getMonitors();
-
   void getFailures(
                out unsigned long failureCount,
                [optional, array, size_is(failureCount)] out long indices,
                [retval, array, size_is(failureCount)] out string failures);
 
   [noscript, notxpcom] void logFailure(in ACString failure);
   /*
    * A set of constants for features that we can ask this GfxInfo object