Bug 1457120 - Use mozilla:: namespace at nsLookAndFeel module, r=jhorak
authorMartin Stransky <stransky@redhat.com>
Thu, 26 Apr 2018 14:59:55 +0200
changeset 472009 50355ef2f138470db57e71389bf6372c957e02b4
parent 472008 f8ad5962fc897cbec562226fb23aa361dadcfa0a
child 472010 3ece4329ec731cb6c1d1238007f8206ca0688fa2
push id1728
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:12:27 +0000
treeherdermozilla-release@c296fde26f5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjhorak
bugs1457120
milestone61.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 1457120 - Use mozilla:: namespace at nsLookAndFeel module, r=jhorak MozReview-Commit-ID: BXZzDAiY0e4
widget/gtk/nsLookAndFeel.cpp
--- a/widget/gtk/nsLookAndFeel.cpp
+++ b/widget/gtk/nsLookAndFeel.cpp
@@ -28,16 +28,17 @@
 #include "nsWindow.h"
 
 #include "mozilla/gfx/2D.h"
 
 #include <cairo-gobject.h>
 #include "WidgetStyleCache.h"
 #include "prenv.h"
 
+using namespace mozilla;
 using mozilla::LookAndFeel;
 
 #define GDK_COLOR_TO_NS_RGB(c) \
     ((nscolor) NS_RGB(c.red>>8, c.green>>8, c.blue>>8))
 #define GDK_RGBA_TO_NS_RGBA(c) \
     ((nscolor) NS_RGBA((int)((c).red*255), (int)((c).green*255), \
                        (int)((c).blue*255), (int)((c).alpha*255)))
 
@@ -718,18 +719,17 @@ GetSystemFontInfo(GtkStyleContext *aStyl
                           "font", &desc, nullptr);
 
     aFontStyle->systemFont = true;
 
     NS_NAMED_LITERAL_STRING(quote, "\"");
     NS_ConvertUTF8toUTF16 family(pango_font_description_get_family(desc));
     *aFontName = quote + family + quote;
 
-    aFontStyle->weight =
-        mozilla::FontWeight(pango_font_description_get_weight(desc));
+    aFontStyle->weight = FontWeight(pango_font_description_get_weight(desc));
 
     // FIXME: Set aFontStyle->stretch correctly!
     aFontStyle->stretch = FontStretch::Normal();
 
     float size = float(pango_font_description_get_size(desc)) / PANGO_SCALE;
 
     // |size| is now either pixels or pango-points (not Mozilla-points!)