diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-12 01:25:43 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-12 01:25:43 +0100 |
commit | 263d8500ce68b279a2d055c322f0ab3eab634989 (patch) | |
tree | 9f258c3d6186346dc4435427ce6565ec376efd5d /widget/windows/nsNativeThemeWin.cpp | |
parent | b06821da15b7ab2573cd18aea8048b94266e3a97 (diff) | |
parent | 8beab28bfff78ccefc8677c5bdddd6f60c544600 (diff) | |
download | uxp-263d8500ce68b279a2d055c322f0ab3eab634989.tar.gz |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/components/preferences/advanced.xul
# application/palemoon/config/version.txt
# modules/libpref/init/all.js
Diffstat (limited to 'widget/windows/nsNativeThemeWin.cpp')
-rw-r--r-- | widget/windows/nsNativeThemeWin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/widget/windows/nsNativeThemeWin.cpp b/widget/windows/nsNativeThemeWin.cpp index 475ebce945..e84a2b80ce 100644 --- a/widget/windows/nsNativeThemeWin.cpp +++ b/widget/windows/nsNativeThemeWin.cpp @@ -8,6 +8,7 @@ #include "mozilla/EventStates.h" #include "mozilla/Logging.h" #include "mozilla/WindowsVersion.h" +#include "mozilla/gfx/Types.h" // for Color::FromABGR #include "nsDeviceContext.h" #include "nsRenderingContext.h" #include "nsRect.h" @@ -40,6 +41,7 @@ #include <algorithm> using namespace mozilla; +using namespace mozilla::gfx; using namespace mozilla::widget; extern mozilla::LazyLogModule gWindowsLog; |