From 4b3190641d1b95516917a33369e0169d8b16f1ce Mon Sep 17 00:00:00 2001 From: Joel Maher Date: Thu, 9 Jul 2015 11:48:06 +0100 Subject: [PATCH] bug 1175005: performance regression. backout_f081c464c1e2 --- widget/GfxInfoX11.cpp | 29 ----------------------------- widget/GfxInfoX11.h | 2 -- 2 files changed, 31 deletions(-) diff --git a/widget/GfxInfoX11.cpp b/widget/GfxInfoX11.cpp index 9276a85dfe5..6bd14a2522b 100644 --- a/widget/GfxInfoX11.cpp +++ b/widget/GfxInfoX11.cpp @@ -14,7 +14,6 @@ #include "prenv.h" #include "GfxInfoX11.h" -#include "mozilla/X11Util.h" #ifdef MOZ_CRASHREPORTER #include "nsExceptionHandler.h" @@ -535,34 +534,6 @@ GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active) return NS_ERROR_FAILURE; } -nsresult -GfxInfo::FindMonitors(JSContext* aCx, JS::HandleObject aOutArray) -{ -#if defined(MOZ_WIDGET_GTK) - // No display in xpcshell mode. - if (!gdk_display_get_default()) { - return NS_OK; - } -#endif - - // Note: this doesn't support Xinerama. Two physical displays will be - // reported as one monitor covering the entire virtual screen. - Display* display = DefaultXDisplay(); - Screen* screen = DefaultScreenOfDisplay(display); - - JS::Rooted obj(aCx, JS_NewPlainObject(aCx)); - - JS::Rooted screenWidth(aCx, JS::Int32Value(WidthOfScreen(screen))); - JS_SetProperty(aCx, obj, "screenWidth", screenWidth); - - JS::Rooted screenHeight(aCx, JS::Int32Value(HeightOfScreen(screen))); - JS_SetProperty(aCx, obj, "screenHeight", screenHeight); - - JS::Rooted element(aCx, JS::ObjectValue(*obj)); - JS_SetElement(aCx, aOutArray, 0, element); - return NS_OK; -} - #ifdef DEBUG // Implement nsIGfxInfoDebug diff --git a/widget/GfxInfoX11.h b/widget/GfxInfoX11.h index 48ed81e06af..545f0736a1f 100644 --- a/widget/GfxInfoX11.h +++ b/widget/GfxInfoX11.h @@ -48,8 +48,6 @@ public: NS_IMETHOD_(void) GetData() override; - nsresult FindMonitors(JSContext* cx, JS::HandleObject array) override; - #ifdef DEBUG NS_DECL_ISUPPORTS_INHERITED NS_DECL_NSIGFXINFODEBUG