Bug 939656 - Fix the GfxInfoBase::OperatingSystemVersion overrides; r=bjacob
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 18 Nov 2013 08:38:17 -0500
changeset 170696 1efac30318e4b0e6bb4d66733b925ecab0ec7b47
parent 170695 134f2dc024688e1740358834d610832c111451b6
child 170697 bb1d989a33a9d9fcad309c7cccc74f61d20ebe45
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbjacob
bugs939656
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 939656 - Fix the GfxInfoBase::OperatingSystemVersion overrides; r=bjacob
widget/android/GfxInfo.h
widget/gonk/GfxInfo.cpp
widget/gonk/GfxInfo.h
widget/windows/GfxInfo.h
widget/xpwidgets/GfxInfoBase.h
--- a/widget/android/GfxInfo.h
+++ b/widget/android/GfxInfo.h
@@ -59,17 +59,17 @@ public:
   virtual nsString Product();
   virtual nsString Manufacturer();
 
 #ifdef DEBUG
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIGFXINFODEBUG
 #endif
 
-  virtual uint32_t OperatingSystemVersion();
+  virtual uint32_t OperatingSystemVersion() MOZ_OVERRIDE;
 
   virtual void InitializeGLStrings(gl::GLContext* gl);
 
 protected:
 
   virtual nsresult GetFeatureStatusImpl(int32_t aFeature, 
                                         int32_t *aStatus, 
                                         nsAString & aSuggestedDriverVersion, 
--- a/widget/gonk/GfxInfo.cpp
+++ b/widget/gonk/GfxInfo.cpp
@@ -148,17 +148,17 @@ GfxInfo::GetIsGPU2Active(bool* aIsGPU2Ac
 }
 
 const nsTArray<GfxDriverInfo>&
 GfxInfo::GetGfxDriverInfo()
 {
   return *mDriverInfo;
 }
 
-uint32_t GfxInfo::OperatingSystemVersion() const
+uint32_t GfxInfo::OperatingSystemVersion()
 {
   return 0;
 }
 
 nsresult
 GfxInfo::GetFeatureStatusImpl(int32_t /*aFeature*/, 
                               int32_t *aStatus, 
                               nsAString & /*aSuggestedDriverVersion*/,
--- a/widget/gonk/GfxInfo.h
+++ b/widget/gonk/GfxInfo.h
@@ -39,17 +39,17 @@ public:
   NS_IMETHOD GetAdapterRAM2(nsAString & aAdapterRAM);
   NS_IMETHOD GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion);
   NS_IMETHOD GetAdapterDriverDate2(nsAString & aAdapterDriverDate);
   NS_IMETHOD GetIsGPU2Active(bool *aIsGPU2Active);
   using GfxInfoBase::GetFeatureStatus;
   using GfxInfoBase::GetFeatureSuggestedDriverVersion;
   using GfxInfoBase::GetWebGLParameter;
 
-  virtual uint32_t OperatingSystemVersion() const;
+  virtual uint32_t OperatingSystemVersion() MOZ_OVERRIDE;
 
 #ifdef DEBUG
   NS_DECL_NSIGFXINFODEBUG
 #endif
 
 protected:
 
   virtual nsresult GetFeatureStatusImpl(int32_t aFeature,
--- a/widget/windows/GfxInfo.h
+++ b/widget/windows/GfxInfo.h
@@ -40,17 +40,17 @@ public:
   NS_IMETHOD GetAdapterDriverDate2(nsAString & aAdapterDriverDate);
   NS_IMETHOD GetIsGPU2Active(bool *aIsGPU2Active);
   using GfxInfoBase::GetFeatureStatus;
   using GfxInfoBase::GetFeatureSuggestedDriverVersion;
   using GfxInfoBase::GetWebGLParameter;
 
   virtual nsresult Init();
 
-  virtual uint32_t OperatingSystemVersion() const { return mWindowsVersion; }
+  virtual uint32_t OperatingSystemVersion() MOZ_OVERRIDE { return mWindowsVersion; }
 
 #ifdef DEBUG
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIGFXINFODEBUG
 #endif
 
 protected:
 
--- a/widget/xpwidgets/GfxInfoBase.h
+++ b/widget/xpwidgets/GfxInfoBase.h
@@ -14,16 +14,17 @@
 #include "nsWeakReference.h"
 #include "GfxDriverInfo.h"
 #include "nsTArray.h"
 #include "nsString.h"
 #include "GfxInfoCollector.h"
 #include "nsIGfxInfoDebug.h"
 #include "mozilla/Mutex.h"
 #include "js/Value.h"
+#include "mozilla/Attributes.h"
 
 namespace mozilla {
 namespace widget {  
 
 class GfxInfoBase : public nsIGfxInfo,
                     public nsIObserver,
                     public nsSupportsWeakReference
 #ifdef DEBUG