Bug 1168527 - Variable was re-declared causing a bustage on gcc 5. r=lsalzman
authorHubert Figuière <hfiguiere@mozilla.com>
Fri, 12 Jun 2015 14:19:34 -0400
changeset 248654 717dd4a0bb6f73eb62282239cc0ae807dbbd6b08
parent 248653 4674ad6dba74578874586b4d3eff1fee513ae5be
child 248655 48a77f828d591e678d8f83b57acad23096efdfc0
push id28901
push userkwierso@gmail.com
push dateSat, 13 Jun 2015 00:17:47 +0000
treeherdermozilla-central@b7ee8e13145a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslsalzman
bugs1168527
milestone41.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 1168527 - Variable was re-declared causing a bustage on gcc 5. r=lsalzman
widget/gtk/nsNativeThemeGTK.cpp
--- a/widget/gtk/nsNativeThemeGTK.cpp
+++ b/widget/gtk/nsNativeThemeGTK.cpp
@@ -817,23 +817,23 @@ DrawThemeWithCairo(gfxContext* aContext,
   if (aScaleFactor != 1)
     transform.PreScale(aScaleFactor, aScaleFactor);
 
   cairo_matrix_t mat;
   GfxMatrixToCairoMatrix(transform, mat);
 
 #ifndef MOZ_TREE_CAIRO
   // Directly use the Cairo draw target to render the widget if using system Cairo everywhere.
-  BorrowedCairoContext borrow(aDrawTarget);
-  if (borrow.mCairo) {
-    cairo_set_matrix(borrow.mCairo, &mat);
+  BorrowedCairoContext borrowCairo(aDrawTarget);
+  if (borrowCairo.mCairo) {
+    cairo_set_matrix(borrowCairo.mCairo, &mat);
 
-    moz_gtk_widget_paint(aGTKWidgetType, borrow.mCairo, &aGDKRect, &aState, aFlags, aDirection);
+    moz_gtk_widget_paint(aGTKWidgetType, borrowCairo.mCairo, &aGDKRect, &aState, aFlags, aDirection);
 
-    borrow.Finish();
+    borrowCairo.Finish();
     return;
   }
 #endif
 
   // A direct Cairo draw target is not available, so we need to create a temporary one.
 #if defined(MOZ_X11) && defined(CAIRO_HAS_XLIB_SURFACE)
   // If using a Cairo xlib surface, then try to reuse it.
   BorrowedXlibDrawable borrow(aDrawTarget);