Bug 1532354 - Remove virtual keyword on GMPServiceChild|GMPServiceParent::GetContentParent. r=cpearce
authorBryce Van Dyk <bvandyk@mozilla.com>
Tue, 05 Mar 2019 00:32:07 +0000
changeset 520248 0bd2a637efa3b877d7145fe9d186afa6550e3ef2
parent 520247 65fc1cf8774f32b733ec0235adb1f61677fdff5f
child 520249 24a48c47224236b2aeaba54d39d509b34dbd188c
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs1532354
milestone67.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 1532354 - Remove virtual keyword on GMPServiceChild|GMPServiceParent::GetContentParent. r=cpearce These functions already specify the override keyword. This change also makes them more consistent with the overloaded versions of the same functions in these classes. Depends on D21968 Differential Revision: https://phabricator.services.mozilla.com/D21975
dom/media/gmp/GMPServiceChild.h
dom/media/gmp/GMPServiceParent.h
--- a/dom/media/gmp/GMPServiceChild.h
+++ b/dom/media/gmp/GMPServiceChild.h
@@ -44,17 +44,17 @@ class GeckoMediaPluginServiceChild : pub
 
   void BeginShutdown();
 
  protected:
   void InitializePlugins(AbstractThread*) override {
     // Nothing to do here.
   }
 
-  virtual RefPtr<GetGMPContentParentPromise> GetContentParent(
+  RefPtr<GetGMPContentParentPromise> GetContentParent(
       GMPCrashHelper* aHelper, const nsACString& aNodeIdString,
       const nsCString& aAPI, const nsTArray<nsCString>& aTags) override;
 
   RefPtr<GetGMPContentParentPromise> GetContentParent(
       GMPCrashHelper* aHelper, const NodeId& aNodeId, const nsCString& aAPI,
       const nsTArray<nsCString>& aTags) override;
 
  private:
--- a/dom/media/gmp/GMPServiceParent.h
+++ b/dom/media/gmp/GMPServiceParent.h
@@ -110,17 +110,17 @@ class GeckoMediaPluginServiceParent fina
  protected:
   friend class GMPParent;
   void ReAddOnGMPThread(const RefPtr<GMPParent>& aOld);
   void PluginTerminated(const RefPtr<GMPParent>& aOld);
   void InitializePlugins(AbstractThread* aAbstractGMPThread) override;
   RefPtr<GenericPromise> LoadFromEnvironment();
   RefPtr<GenericPromise> AddOnGMPThread(nsString aDirectory);
 
-  virtual RefPtr<GetGMPContentParentPromise> GetContentParent(
+  RefPtr<GetGMPContentParentPromise> GetContentParent(
       GMPCrashHelper* aHelper, const nsACString& aNodeIdString,
       const nsCString& aAPI, const nsTArray<nsCString>& aTags) override;
 
   RefPtr<GetGMPContentParentPromise> GetContentParent(
       GMPCrashHelper* aHelper, const NodeId& aNodeId, const nsCString& aAPI,
       const nsTArray<nsCString>& aTags) override;
 
  private: