bug 1122065 - use MOZ_OVERRIDE more in gfxish things r=jrmuizel
authorTrevor Saunders <trev.saunders@gmail.com>
Thu, 15 Jan 2015 10:52:10 -0500
changeset 253353 a5c9550c4e4ff746fbd83399057f8fadf92de459
parent 253352 090caf88ccfb1c097ba55799d98e4937ab33af34
child 253354 5183c96b9fb2af53cce4002b3dc0050fe9e4e149
push id721
push userjlund@mozilla.com
push dateTue, 21 Apr 2015 23:03:33 +0000
treeherdermozilla-release@d27c9211ebb3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1122065
milestone38.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 1122065 - use MOZ_OVERRIDE more in gfxish things r=jrmuizel
gfx/thebes/gfxASurface.h
gfx/thebes/gfxFont.h
image/src/imgRequestProxy.h
layout/base/nsLayoutUtils.h
widget/GfxInfoCollector.h
--- a/gfx/thebes/gfxASurface.h
+++ b/gfx/thebes/gfxASurface.h
@@ -224,15 +224,15 @@ class gfxUnknownSurface : public gfxASur
 public:
     gfxUnknownSurface(cairo_surface_t *surf, const gfxIntSize& aSize)
         : mSize(aSize)
     {
         Init(surf, true);
     }
 
     virtual ~gfxUnknownSurface() { }
-    virtual const nsIntSize GetSize() const { return mSize; }
+    virtual const nsIntSize GetSize() const MOZ_OVERRIDE { return mSize; }
 
 private:
     nsIntSize mSize;
 };
 
 #endif /* GFX_ASURFACE_H */
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -307,17 +307,17 @@ public:
 
     // The font's refcount has gone to zero; give ownership of it to
     // the cache. We delete it if it's not acquired again after a certain
     // amount of time.
     void NotifyReleased(gfxFont *aFont);
 
     // This gets called when the timeout has expired on a zero-refcount
     // font; we just delete it.
-    virtual void NotifyExpired(gfxFont *aFont);
+    virtual void NotifyExpired(gfxFont *aFont) MOZ_OVERRIDE;
 
     // Cleans out the hashtable and removes expired fonts waiting for cleanup.
     // Other gfxFont objects may be still in use but they will be pushed
     // into the expiration queues and removed.
     void Flush() {
         mFonts.Clear();
         AgeAllGenerations();
     }
@@ -1192,17 +1192,17 @@ public:
     }
 
     // Override operator delete to properly free the object that was
     // allocated via moz_malloc.
     void operator delete(void* p) {
         moz_free(p);
     }
 
-    CompressedGlyph *GetCharacterGlyphs() {
+    virtual CompressedGlyph *GetCharacterGlyphs() MOZ_OVERRIDE {
         return &mCharGlyphsStorage[0];
     }
 
     const uint8_t* Text8Bit() const {
         NS_ASSERTION(TextIs8Bit(), "invalid use of Text8Bit()");
         return reinterpret_cast<const uint8_t*>(mCharGlyphsStorage + GetLength());
     }
 
--- a/image/src/imgRequestProxy.h
+++ b/image/src/imgRequestProxy.h
@@ -140,17 +140,17 @@ protected:
 
   class imgCancelRunnable : public nsRunnable
   {
     public:
       imgCancelRunnable(imgRequestProxy* owner, nsresult status)
         : mOwner(owner), mStatus(status)
       {}
 
-      NS_IMETHOD Run() {
+      NS_IMETHOD Run() MOZ_OVERRIDE {
         mOwner->DoCancel(mStatus);
         return NS_OK;
       }
 
     private:
       nsRefPtr<imgRequestProxy> mOwner;
       nsresult mStatus;
   };
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -1077,24 +1077,24 @@ public:
 
   struct RectAccumulator : public RectCallback {
     nsRect mResultRect;
     nsRect mFirstRect;
     bool mSeenFirstRect;
 
     RectAccumulator();
 
-    virtual void AddRect(const nsRect& aRect);
+    virtual void AddRect(const nsRect& aRect) MOZ_OVERRIDE;
   };
 
   struct RectListBuilder : public RectCallback {
     DOMRectList* mRectList;
 
     explicit RectListBuilder(DOMRectList* aList);
-    virtual void AddRect(const nsRect& aRect);
+    virtual void AddRect(const nsRect& aRect) MOZ_OVERRIDE;
   };
 
   static nsIFrame* GetContainingBlockForClientRect(nsIFrame* aFrame);
 
   enum {
     RECTS_ACCOUNT_FOR_TRANSFORMS = 0x01,
     // Two bits for specifying which box type to use.
     // With neither bit set (default), use the border box.
--- a/widget/GfxInfoCollector.h
+++ b/widget/GfxInfoCollector.h
@@ -73,17 +73,17 @@ class GfxInfoCollectorBase
 };
 
 template<class T>
 class GfxInfoCollector : public GfxInfoCollectorBase
 {
   public:
   GfxInfoCollector(T* aPointer, void (T::*aFunc)(InfoObject &obj)) : mPointer(aPointer), mFunc(aFunc) {
   }
-  virtual void GetInfo(InfoObject &obj) {
+  virtual void GetInfo(InfoObject &obj) MOZ_OVERRIDE {
     (mPointer->*mFunc)(obj);
   }
 
   protected:
   T* mPointer;
   void (T::*mFunc)(InfoObject &obj);
 
 };