Commit 34ab9f65 authored by Ehsan Akhgari's avatar Ehsan Akhgari
Browse files

Bug 939656 - Fix the GfxInfoBase::OperatingSystemVersion overrides; r=bjacob

parent 290fd5ae

widget/android/GfxInfo.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public: 
  NS_DECL_NSIGFXINFODEBUG

#endif



  virtual uint32_t OperatingSystemVersion();

  virtual uint32_t OperatingSystemVersion() MOZ_OVERRIDE;



  virtual void InitializeGLStrings(gl::GLContext* gl);

widget/gonk/GfxInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ GfxInfo::GetGfxDriverInfo() 
  return *mDriverInfo;

}



uint32_t GfxInfo::OperatingSystemVersion() const

uint32_t GfxInfo::OperatingSystemVersion()

{

  return 0;

}

widget/gonk/GfxInfo.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public: 
  using GfxInfoBase::GetFeatureSuggestedDriverVersion;

  using GfxInfoBase::GetWebGLParameter;



  virtual uint32_t OperatingSystemVersion() const;

  virtual uint32_t OperatingSystemVersion() MOZ_OVERRIDE;



#ifdef DEBUG

  NS_DECL_NSIGFXINFODEBUG

widget/windows/GfxInfo.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public: 


  virtual nsresult Init();



  virtual uint32_t OperatingSystemVersion() const { return mWindowsVersion; }

  virtual uint32_t OperatingSystemVersion() MOZ_OVERRIDE { return mWindowsVersion; }



#ifdef DEBUG

  NS_DECL_ISUPPORTS_INHERITED

widget/xpwidgets/GfxInfoBase.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "nsIGfxInfoDebug.h"

#include "mozilla/Mutex.h"

#include "js/Value.h"

#include "mozilla/Attributes.h"



namespace mozilla {

namespace widget {