Backed out changeset 4f82f0b92629 (bug 1573813) for browser-chrome crashes on /browser_bookmarkProperties_folderSelection.js. CLOSED TREE
authorCsoregi Natalia <ncsoregi@mozilla.com>
Tue, 20 Aug 2019 21:48:27 +0300
changeset 489044 64ae9ab76db043f763982b086ecbfe6f35dc1d14
parent 489043 7f7c67f05fb345d01650f207b1f5f0557a8c9020
child 489045 c4beb93536583415da4c05c3d27154d38d8e4970
push id93093
push userncsoregi@mozilla.com
push dateTue, 20 Aug 2019 18:50:22 +0000
treeherderautoland@64ae9ab76db0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1573813
milestone70.0a1
backs out4f82f0b92629af3ebb20dadd661c2149f3c48f8b
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 4f82f0b92629 (bug 1573813) for browser-chrome crashes on /browser_bookmarkProperties_folderSelection.js. CLOSED TREE
widget/gtk/nsWindow.cpp
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -6571,28 +6571,21 @@ void nsWindow::SetDrawsInTitlebar(bool a
       UpdateTitlebarTransparencyBitmap();
     } else {
       ClearTransparencyBitmap();
     }
   }
 }
 
 gint nsWindow::GdkScaleFactor() {
-  // For popup windows with parent window we need to get scale factor of the
-  // parent window. Otherwise the scale factor of the popup is not updated
-  // during it's hidden.
-  GdkWindow* scaledGdkWindow = mGdkWindow;
-  if (mToplevelParentWindow) {
-    scaledGdkWindow = gtk_widget_get_window(GTK_WIDGET(mToplevelParentWindow));
-  }
   // Available as of GTK 3.10+
   static auto sGdkWindowGetScaleFactorPtr =
       (gint(*)(GdkWindow*))dlsym(RTLD_DEFAULT, "gdk_window_get_scale_factor");
-  if (sGdkWindowGetScaleFactorPtr && scaledGdkWindow)
-    return (*sGdkWindowGetScaleFactorPtr)(scaledGdkWindow);
+  if (sGdkWindowGetScaleFactorPtr && mGdkWindow)
+    return (*sGdkWindowGetScaleFactorPtr)(mGdkWindow);
   return ScreenHelperGTK::GetGTKMonitorScaleFactor();
 }
 
 gint nsWindow::DevicePixelsToGdkCoordRoundUp(int pixels) {
   gint scale = GdkScaleFactor();
   return (pixels + scale - 1) / scale;
 }