Backed out changeset 349f51081127 (bug 1403690)

widget/gtk/nsLookAndFeel.cpp

@@ -53,6 +53,12 @@ nsLookAndFeel::nsLookAndFeel()
 {
 }
 
+void
+nsLookAndFeel::NativeInit()
+{
+    EnsureInit();
+}
+
 nsLookAndFeel::~nsLookAndFeel()
 {
 }
@@ -214,26 +220,6 @@ GetBorderColors(GtkStyleContext* aContext,
     return ret;
 }
 
-void
-nsLookAndFeel::NativeInit()
-{
-    EnsureInit();
-}
-
-void
-nsLookAndFeel::RefreshImpl()
-{
-    nsXPLookAndFeel::RefreshImpl();
-    moz_gtk_refresh();
-
-    mDefaultFontCached = false;
-    mButtonFontCached = false;
-    mFieldFontCached = false;
-    mMenuFontCached = false;
-
-    mInitialized = false;
-}
-
 nsresult
 nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)
 {
@@ -1113,6 +1099,20 @@ nsLookAndFeel::GetPasswordCharacterImpl()
     return sInvisibleCharacter;
 }
 
+void
+nsLookAndFeel::RefreshImpl()
+{
+    nsXPLookAndFeel::RefreshImpl();
+    moz_gtk_refresh();
+
+    mDefaultFontCached = false;
+    mButtonFontCached = false;
+    mFieldFontCached = false;
+    mMenuFontCached = false;
+
+    mInitialized = false;
+}
+
 bool
 nsLookAndFeel::GetEchoPasswordImpl() {
     return false;

widget/gtk/nsLookAndFeel.h

@@ -20,15 +20,15 @@ public:
     nsLookAndFeel();
     virtual ~nsLookAndFeel();
 
-    virtual void NativeInit() final;
-    virtual void RefreshImpl();
     virtual nsresult NativeGetColor(ColorID aID, nscolor &aResult);
+    virtual void NativeInit() final;
     virtual nsresult GetIntImpl(IntID aID, int32_t &aResult);
     virtual nsresult GetFloatImpl(FloatID aID, float &aResult);
     virtual bool GetFontImpl(FontID aID, nsString& aFontName,
                              gfxFontStyle& aFontStyle,
                              float aDevPixPerCSSPixel);
 
+    virtual void RefreshImpl();
     virtual char16_t GetPasswordCharacterImpl();
     virtual bool GetEchoPasswordImpl();