From eec03266769717b4de481eb4d5a17fb8c396b5f0 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Tue, 14 Apr 2015 18:06:58 +0200
Subject: [PATCH] Bug 1153829 - Don't use MOZ_ALWAYS_INLINE for non-inline
 functions. r=jimm

---
 widget/windows/KeyboardLayout.cpp |  6 ------
 widget/windows/KeyboardLayout.h   | 21 ++++++++++++---------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/widget/windows/KeyboardLayout.cpp b/widget/windows/KeyboardLayout.cpp
index 5a21df53fb59..b33ece100ddd 100644
--- a/widget/windows/KeyboardLayout.cpp
+++ b/widget/windows/KeyboardLayout.cpp
@@ -371,12 +371,6 @@ ModifierKeyState::IsScrollLocked() const
   return (mModifiers & MODIFIER_SCROLLLOCK) != 0;
 }
 
-Modifiers
-ModifierKeyState::GetModifiers() const
-{
-  return mModifiers;
-}
-
 void
 ModifierKeyState::EnsureAltGr()
 {
diff --git a/widget/windows/KeyboardLayout.h b/widget/windows/KeyboardLayout.h
index a154b8e9ee57..79979044c6e6 100644
--- a/widget/windows/KeyboardLayout.h
+++ b/widget/windows/KeyboardLayout.h
@@ -62,24 +62,27 @@ public:
   ModifierKeyState(bool aIsShiftDown, bool aIsControlDown, bool aIsAltDown);
   ModifierKeyState(Modifiers aModifiers);
 
-  MOZ_ALWAYS_INLINE void Update();
+  void Update();
 
-  MOZ_ALWAYS_INLINE void Unset(Modifiers aRemovingModifiers);
+  void Unset(Modifiers aRemovingModifiers);
   void Set(Modifiers aAddingModifiers);
 
   void InitInputEvent(WidgetInputEvent& aInputEvent) const;
 
   bool IsShift() const;
   bool IsControl() const;
-  MOZ_ALWAYS_INLINE bool IsAlt() const;
-  MOZ_ALWAYS_INLINE bool IsAltGr() const;
-  MOZ_ALWAYS_INLINE bool IsWin() const;
+  bool IsAlt() const;
+  bool IsAltGr() const;
+  bool IsWin() const;
 
-  MOZ_ALWAYS_INLINE bool IsCapsLocked() const;
-  MOZ_ALWAYS_INLINE bool IsNumLocked() const;
-  MOZ_ALWAYS_INLINE bool IsScrollLocked() const;
+  bool IsCapsLocked() const;
+  bool IsNumLocked() const;
+  bool IsScrollLocked() const;
 
-  MOZ_ALWAYS_INLINE Modifiers GetModifiers() const;
+  MOZ_ALWAYS_INLINE Modifiers GetModifiers() const
+  {
+    return mModifiers;
+  }
 
 private:
   Modifiers mModifiers;