Bug 1277649 - add override declarations for Android-specific codepaths; r=snorp
authorNathan Froyd <froydnj@gmail.com>
Fri, 03 Jun 2016 18:31:05 -0400
changeset 375198 648a8ccff0394235e2a21b02824be6a87dd66210
parent 375197 b0139b57d0ccf65b95b7a3c60a693a0422c232dd
child 375199 55df8b698e664f3082b394a043d0c9b57fc0dc9f
push id20189
push userjlund@mozilla.com
push dateFri, 03 Jun 2016 17:40:55 +0000
Bug 1277649 - add override declarations for Android-specific codepaths; r=snorp Adding these makes the compiler much happier.
--- a/gfx/layers/opengl/TextureHostOGL.h
+++ b/gfx/layers/opengl/TextureHostOGL.h
@@ -346,29 +346,29 @@ public:
                        mozilla::gl::AndroidSurfaceTexture* aSurfTex,
                        gfx::SurfaceFormat aFormat,
                        GLenum aTarget,
                        GLenum aWrapMode,
                        gfx::IntSize aSize);
   virtual const char* Name() const override { return "SurfaceTextureSource"; }
-  virtual TextureSourceOGL* AsSourceOGL() { return this; }
+  virtual TextureSourceOGL* AsSourceOGL() override { return this; }
   virtual void BindTexture(GLenum activetex, gfx::Filter aFilter) override;
   virtual bool IsValid() const override;
   virtual gfx::IntSize GetSize() const override { return mSize; }
   virtual gfx::SurfaceFormat GetFormat() const override { return mFormat; }
   virtual gfx::Matrix4x4 GetTextureTransform() override;
-  virtual GLenum GetTextureTarget() const { return mTextureTarget; }
+  virtual GLenum GetTextureTarget() const override { return mTextureTarget; }
   virtual GLenum GetWrapMode() const override { return mWrapMode; }
   virtual void DeallocateDeviceData() override;
   virtual void SetCompositor(Compositor* aCompositor) override;
   gl::GLContext* gl() const;
@@ -413,17 +413,17 @@ public:
     return nullptr; // XXX - implement this (for MOZ_DUMP_PAINTING)
   gl::GLContext* gl() const;
   virtual gfx::IntSize GetSize() const override { return mSize; }
-  virtual const char* Name() { return "SurfaceTextureHost"; }
+  virtual const char* Name() override { return "SurfaceTextureHost"; }
   RefPtr<gl::AndroidSurfaceTexture> mSurfTex;
   const gfx::IntSize mSize;
   RefPtr<CompositorOGL> mCompositor;
   RefPtr<SurfaceTextureSource> mTextureSource;
--- a/gfx/thebes/gfxAndroidPlatform.cpp
+++ b/gfx/thebes/gfxAndroidPlatform.cpp
@@ -66,17 +66,17 @@ public:
     static void*
     Realloc(FT_Memory, long cur_size, long new_size, void* p)
         return CountingRealloc(p, new_size);
     NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
-                              nsISupports* aData, bool aAnonymize)
+                              nsISupports* aData, bool aAnonymize) override
         return MOZ_COLLECT_REPORT(
             "explicit/freetype", KIND_HEAP, UNITS_BYTES, MemoryAllocated(),
             "Memory used by Freetype.");
 NS_IMPL_ISUPPORTS(FreetypeReporter, nsIMemoryReporter)
--- a/gfx/thebes/gfxAndroidPlatform.h
+++ b/gfx/thebes/gfxAndroidPlatform.h
@@ -27,33 +27,33 @@ public:
     virtual ~gfxAndroidPlatform();
     static gfxAndroidPlatform *GetPlatform() {
         return (gfxAndroidPlatform*) gfxPlatform::GetPlatform();
     virtual already_AddRefed<gfxASurface>
     CreateOffscreenSurface(const IntSize& aSize,
-                           gfxImageFormat aFormat);
+                           gfxImageFormat aFormat) override;
-    virtual gfxImageFormat GetOffscreenFormat() { return mOffscreenFormat; }
+    virtual gfxImageFormat GetOffscreenFormat() override { return mOffscreenFormat; }
-      GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont);
+      GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont) override;
     // to support IPC font list (sharing between chrome and content)
     void GetSystemFontList(InfallibleTArray<FontListEntry>* retValue);
     // platform implementations of font functions
-    virtual bool IsFontFormatSupported(nsIURI *aFontURI, uint32_t aFormatFlags);
-    virtual gfxPlatformFontList* CreatePlatformFontList();
+    virtual bool IsFontFormatSupported(nsIURI *aFontURI, uint32_t aFormatFlags) override;
+    virtual gfxPlatformFontList* CreatePlatformFontList() override;
     virtual void GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
                                         Script aRunScript,
-                                        nsTArray<const char*>& aFontList);
+                                        nsTArray<const char*>& aFontList) override;
     CreateFontGroup(const mozilla::FontFamilyList& aFontFamilyList,
                     const gfxFontStyle *aStyle,
                     gfxTextPerfMetrics* aTextPerf,
                     gfxUserFontSet *aUserFontSet,
                     gfxFloat aDevToCssSize) override;
--- a/gfx/thebes/gfxFT2FontList.h
+++ b/gfx/thebes/gfxFT2FontList.h
@@ -58,41 +58,41 @@ public:
     // to be freed after the face is destroyed
     static FT2FontEntry* 
     CreateFontEntry(FT_Face aFace,
                     const char *aFilename, uint8_t aIndex,
                     const nsAString& aName,
                     const uint8_t* aFontData = nullptr);
     virtual gfxFont *CreateFontInstance(const gfxFontStyle *aFontStyle,
-                                        bool aNeedsBold);
+                                        bool aNeedsBold) override;
     // Create (if necessary) and return the cairo_font_face for this font.
     // This may fail and return null, so caller must be prepared to handle this.
     cairo_font_face_t *CairoFontFace();
     // Create a cairo_scaled_font for this face, with the given style.
     // This may fail and return null, so caller must be prepared to handle this.
     cairo_scaled_font_t *CreateScaledFont(const gfxFontStyle *aStyle);
-    nsresult ReadCMAP(FontInfoData *aFontInfoData = nullptr);
+    nsresult ReadCMAP(FontInfoData *aFontInfoData = nullptr) override;
     virtual hb_blob_t* GetFontTable(uint32_t aTableTag) override;
     virtual nsresult CopyFontTable(uint32_t aTableTag,
                                    nsTArray<uint8_t>& aBuffer) override;
     // Check for various kinds of brokenness, and set flags on the entry
     // accordingly so that we avoid using bad font tables
     void CheckForBrokenFont(gfxFontFamily *aFamily);
     virtual void AddSizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf,
-                                        FontListSizes* aSizes) const;
+                                        FontListSizes* aSizes) const override;
     virtual void AddSizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf,
-                                        FontListSizes* aSizes) const;
+                                        FontListSizes* aSizes) const override;
     FT_Face mFTFace;
     cairo_font_face_t *mFontFace;
     nsCString mFilename;
     uint8_t   mFTFontIndex;
--- a/gfx/thebes/gfxFT2Fonts.h
+++ b/gfx/thebes/gfxFT2Fonts.h
@@ -50,33 +50,33 @@ public: // new functions
             // this is a new entry, fill it
             FillGlyphDataForChar(ch, &entry->mData);
         return &entry->mData;
     virtual void AddSizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf,
-                                        FontCacheSizes* aSizes) const;
+                                        FontCacheSizes* aSizes) const override;
     virtual void AddSizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf,
-                                        FontCacheSizes* aSizes) const;
+                                        FontCacheSizes* aSizes) const override;
 #ifdef USE_SKIA
     virtual already_AddRefed<mozilla::gfx::GlyphRenderingOptions>
         GetGlyphRenderingOptions(const TextRunDrawParams* aRunParams = nullptr) override;
     virtual bool ShapeText(DrawTarget      *aDrawTarget,
                            const char16_t *aText,
                            uint32_t         aOffset,
                            uint32_t         aLength,
                            Script           aScript,
                            bool             aVertical,
-                           gfxShapedText   *aShapedText);
+                           gfxShapedText   *aShapedText) override;
     void FillGlyphDataForChar(uint32_t ch, CachedGlyphData *gd);
     void AddRange(const char16_t *aText,
                   uint32_t         aOffset,
                   uint32_t         aLength,
                   gfxShapedText   *aShapedText);
--- a/layout/base/nsPresShell.h
+++ b/layout/base/nsPresShell.h
@@ -749,17 +749,17 @@ protected:
   bool ScheduleReflowOffTimer();
   // Widget notificiations
   virtual void WindowSizeMoveDone() override;
   virtual void SysColorChanged() override { mPresContext->SysColorChanged(); }
   virtual void ThemeChanged() override { mPresContext->ThemeChanged(); }
   virtual void BackingScaleFactorChanged() override { mPresContext->UIResolutionChanged(); }
 #ifdef ANDROID
-  virtual nsIDocument* GetTouchEventTargetDocument();
+  virtual nsIDocument* GetTouchEventTargetDocument() override;
   virtual void PausePainting() override;
   virtual void ResumePainting() override;
   void UpdateActivePointerState(mozilla::WidgetGUIEvent* aEvent);