Bug 1488659 - Part 2: Remove some dead code and mark the remaining detector classes as final; r=hsivonen
authorEhsan Akhgari <ehsan@mozilla.com>
Sun, 09 Sep 2018 20:32:04 -0400
changeset 435450 68ad5bdca1ce
parent 435449 d94ad30a3001
child 435451 2de4d7059d7f
push id107637
push usereakhgari@mozilla.com
push dateMon, 10 Sep 2018 11:59:50 +0000
treeherdermozilla-inbound@68ad5bdca1ce [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershsivonen
bugs1488659
milestone64.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 1488659 - Part 2: Remove some dead code and mark the remaining detector classes as final; r=hsivonen Differential Revision: https://phabricator.services.mozilla.com/D5393
extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.h
intl/chardet/nsCyrillicDetector.h
--- a/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.h
+++ b/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.h
@@ -55,23 +55,16 @@ class nsXPCOMStringDetector :
     virtual void Report(const char* aCharset) override;
   private:
     nsCOMPtr<nsICharsetDetectionObserver> mObserver;
     const char* mResult;
 };
 
 //=====================================================================
 
-class nsJAPSMDetector : public nsXPCOMDetector
+class nsJAPSMDetector final : public nsXPCOMDetector
 {
 public:
   nsJAPSMDetector()
     : nsXPCOMDetector() {}
 };
 
-class nsJAStringPSMDetector : public nsXPCOMStringDetector
-{
-public:
-  nsJAStringPSMDetector()
-    : nsXPCOMStringDetector() {}
-};
-
 #endif //_nsUdetXPCOMWrapper_h__
--- a/intl/chardet/nsCyrillicDetector.h
+++ b/intl/chardet/nsCyrillicDetector.h
@@ -118,37 +118,23 @@ class nsCyrXPCOMStringDetector :
   protected:
     virtual ~nsCyrXPCOMStringDetector();
     virtual void Report(const char* aCharset) override;
   private:
     nsCOMPtr<nsICharsetDetectionObserver> mObserver;
     const char* mResult;
 };
 
-class nsRUProbDetector : public nsCyrXPCOMDetector
+class nsRUProbDetector final : public nsCyrXPCOMDetector
 {
   public:
     nsRUProbDetector()
       : nsCyrXPCOMDetector(5, gCyrillicCls, gRussian) {}
 };
 
-class nsRUStringProbDetector : public nsCyrXPCOMStringDetector
-{
-  public:
-    nsRUStringProbDetector()
-      : nsCyrXPCOMStringDetector(5, gCyrillicCls, gRussian) {}
-};
-
-class nsUKProbDetector : public nsCyrXPCOMDetector
+class nsUKProbDetector final : public nsCyrXPCOMDetector
 {
   public:
     nsUKProbDetector()
       : nsCyrXPCOMDetector(5, gCyrillicCls, gUkrainian) {}
 };
 
-class nsUKStringProbDetector : public nsCyrXPCOMStringDetector
-{
-  public:
-    nsUKStringProbDetector()
-      : nsCyrXPCOMStringDetector(5, gCyrillicCls, gUkrainian) {}
-};
-
 #endif