mozilla-central: changeset 243652:7da7fb5c7d383f9577d534e10d202a13a44fac0e

author	Daniel Holbert <dholbert@cs.stanford.edu>
	Tue, 12 May 2015 23:36:47 -0700
changeset 243652	7da7fb5c7d383f9577d534e10d202a13a44fac0e
parent 243651	8e7689f926e955b81fac5d59d3b648229295dafc
child 243653	66d87284ab5c18499d3e10b3134b486678975ea1
push id	28744
push user	kwierso@gmail.com
push date	Wed, 13 May 2015 18:12:16 +0000
treeherder	mozilla-central@324c3423deaf [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ehsan
bugs	1056479
milestone	41.0a1
first release with	nightly linux32 1fab94ad196c / 41.0a1 / 20150514032200 / files nightly linux64 1fab94ad196c / 41.0a1 / 20150514032200 / files nightly mac 1fab94ad196c / 41.0a1 / 20150514032200 / files nightly win32 0f1d42a6745a / 41.0a1 / 20150514111810 / files nightly win64 0f1d42a6745a / 41.0a1 / 20150514111810 / files
last release without	nightly linux32 62d9b117c688 / 41.0a1 / 20150513030209 / files nightly linux64 62d9b117c688 / 41.0a1 / 20150513030209 / files nightly mac 62d9b117c688 / 41.0a1 / 20150513030209 / files nightly win32 62d9b117c688 / 41.0a1 / 20150513030209 / files nightly win64 62d9b117c688 / 41.0a1 / 20150513030209 / files

--- a/gfx/thebes/gfxPlatformGtk.h
+++ b/gfx/thebes/gfxPlatformGtk.h
@@ -41,17 +41,17 @@ public:
 
     virtual nsresult UpdateFontList() override;
 
     virtual void
     GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh,
                            int32_t aRunScript,
                            nsTArray<const char*>& aFontList) override;
 
-    virtual gfxPlatformFontList* CreatePlatformFontList();
+    virtual gfxPlatformFontList* CreatePlatformFontList() override;
 
     virtual nsresult GetStandardFamilyName(const nsAString& aFontName,
                                            nsAString& aFamilyName) override;
 
     virtual gfxFontGroup* CreateFontGroup(const mozilla::FontFamilyList& aFontFamilyList,
                                           const gfxFontStyle *aStyle,
                                           gfxUserFontSet *aUserFontSet) override;