Bug 1089023 - Unbreak GTK3 build after bug 1087732. r=jwatt
authorJan Beich <jbeich@vfemail.net>
Sat, 25 Oct 2014 10:08:00 +0200
changeset 212434 7d94c7fdac817f38101dc392a1a8140d32a962fe
parent 212433 e35b9c9fa3cc8b45c32e234d3df15cd7015827dc
child 212435 dd8a8ae92fce8f154c57280782c9b0e37d4815eb
push id27710
push usercbook@mozilla.com
push dateMon, 27 Oct 2014 14:52:01 +0000
treeherdermozilla-central@d65d20dc0ac2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjwatt
bugs1089023, 1087732
milestone36.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 1089023 - Unbreak GTK3 build after bug 1087732. r=jwatt
widget/gtk/nsNativeThemeGTK.cpp
--- a/widget/gtk/nsNativeThemeGTK.cpp
+++ b/widget/gtk/nsNativeThemeGTK.cpp
@@ -29,16 +29,17 @@
 #include <gtk/gtk.h>
 
 #include "gfxContext.h"
 #include "gfxPlatformGtk.h"
 #include "gfxGdkNativeRenderer.h"
 #include <algorithm>
 
 using namespace mozilla;
+using namespace mozilla::gfx;
 
 NS_IMPL_ISUPPORTS_INHERITED(nsNativeThemeGTK, nsNativeTheme, nsITheme,
                                                              nsIObserver)
 
 static int gLastGdkError;
 
 nsNativeThemeGTK::nsNativeThemeGTK()
 {
@@ -875,20 +876,20 @@ nsNativeThemeGTK::DrawWidgetBackground(n
   }
 
   // GtkStyles (used by the widget drawing backend) are created for a
   // particular colormap/visual.
   GdkColormap* colormap = moz_gtk_widget_get_colormap();
 
   renderer.Draw(ctx, drawingRect.Size(), rendererFlags, colormap);
 #else 
-  cairo_t *ctx =
-    (cairo_t*)aDrawTarget->GetNativeSurface(NativeSurfaceType::CAIRO_CONTEXT); 
-  MOZ_ASSERT(ctx);
-  moz_gtk_widget_paint(gtkWidgetType, ctx, &gdk_rect, 
+  cairo_t *cairo_ctx =
+    (cairo_t*)aDrawTarget.GetNativeSurface(NativeSurfaceType::CAIRO_CONTEXT); 
+  MOZ_ASSERT(cairo_ctx);
+  moz_gtk_widget_paint(gtkWidgetType, cairo_ctx, &gdk_rect, 
                        &state, flags, direction);
 #endif
 
   if (!safeState) {
     gdk_flush();
     gLastGdkError = gdk_error_trap_pop ();
 
     if (gLastGdkError) {