diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp index b8ee26b898c3..c898a229be68 100644 --- a/widget/gtk/nsLookAndFeel.cpp +++ b/widget/gtk/nsLookAndFeel.cpp @@ -53,12 +53,6 @@ nsLookAndFeel::nsLookAndFeel() { } -void -nsLookAndFeel::NativeInit() -{ - EnsureInit(); -} - nsLookAndFeel::~nsLookAndFeel() { } @@ -220,6 +214,26 @@ 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) { @@ -1099,20 +1113,6 @@ 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; diff --git a/widget/gtk/nsLookAndFeel.h b/widget/gtk/nsLookAndFeel.h index 6e14236e604a..092f152d871f 100644 --- a/widget/gtk/nsLookAndFeel.h +++ b/widget/gtk/nsLookAndFeel.h @@ -20,15 +20,15 @@ public: nsLookAndFeel(); virtual ~nsLookAndFeel(); - virtual nsresult NativeGetColor(ColorID aID, nscolor &aResult); virtual void NativeInit() final; + virtual void RefreshImpl(); + virtual nsresult NativeGetColor(ColorID aID, nscolor &aResult); 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();