Bug 1457120 - Use mozilla:: namespace at nsLookAndFeel module, r?jhorak draft
authorMartin Stransky <stransky@redhat.com>
Thu, 26 Apr 2018 14:59:55 +0200
changeset 788358 2b81c20c204f3fd5653ebb7053acd3f412f9af9a
parent 788352 b47ab45f66ecc0cbb7815bca91943ac7c68167db
push id107978
push userstransky@redhat.com
push dateThu, 26 Apr 2018 13:14:59 +0000
reviewersjhorak
bugs1457120
milestone61.0a1
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!)