Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
michael@0 | 2 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 5 | |
michael@0 | 6 | #include "mozilla/ModuleUtils.h" |
michael@0 | 7 | |
michael@0 | 8 | #include "nsCOMPtr.h" |
michael@0 | 9 | |
michael@0 | 10 | #include "nspr.h" |
michael@0 | 11 | #include "nsString.h" |
michael@0 | 12 | #include "nsUniversalCharDetDll.h" |
michael@0 | 13 | #include "nsISupports.h" |
michael@0 | 14 | #include "nsICategoryManager.h" |
michael@0 | 15 | #include "nsIComponentManager.h" |
michael@0 | 16 | #include "nsIServiceManager.h" |
michael@0 | 17 | #include "nsICharsetDetector.h" |
michael@0 | 18 | #include "nsIStringCharsetDetector.h" |
michael@0 | 19 | |
michael@0 | 20 | #include "nsUniversalDetector.h" |
michael@0 | 21 | #include "nsUdetXPCOMWrapper.h" |
michael@0 | 22 | |
michael@0 | 23 | |
michael@0 | 24 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsUniversalXPCOMDetector) |
michael@0 | 25 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsUniversalXPCOMStringDetector) |
michael@0 | 26 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAPSMDetector) |
michael@0 | 27 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAStringPSMDetector) |
michael@0 | 28 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOPSMDetector) |
michael@0 | 29 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOStringPSMDetector) |
michael@0 | 30 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHTWPSMDetector) |
michael@0 | 31 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHTWStringPSMDetector) |
michael@0 | 32 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHCNPSMDetector) |
michael@0 | 33 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHCNStringPSMDetector) |
michael@0 | 34 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHPSMDetector) |
michael@0 | 35 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHStringPSMDetector) |
michael@0 | 36 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsCJKPSMDetector) |
michael@0 | 37 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsCJKStringPSMDetector) |
michael@0 | 38 | NS_DEFINE_NAMED_CID(NS_UNIVERSAL_DETECTOR_CID); |
michael@0 | 39 | NS_DEFINE_NAMED_CID(NS_UNIVERSAL_STRING_DETECTOR_CID); |
michael@0 | 40 | NS_DEFINE_NAMED_CID(NS_JA_PSMDETECTOR_CID); |
michael@0 | 41 | NS_DEFINE_NAMED_CID(NS_JA_STRING_PSMDETECTOR_CID); |
michael@0 | 42 | NS_DEFINE_NAMED_CID(NS_KO_PSMDETECTOR_CID); |
michael@0 | 43 | NS_DEFINE_NAMED_CID(NS_KO_STRING_PSMDETECTOR_CID); |
michael@0 | 44 | NS_DEFINE_NAMED_CID(NS_ZHTW_PSMDETECTOR_CID); |
michael@0 | 45 | NS_DEFINE_NAMED_CID(NS_ZHTW_STRING_PSMDETECTOR_CID); |
michael@0 | 46 | NS_DEFINE_NAMED_CID(NS_ZHCN_PSMDETECTOR_CID); |
michael@0 | 47 | NS_DEFINE_NAMED_CID(NS_ZHCN_STRING_PSMDETECTOR_CID); |
michael@0 | 48 | NS_DEFINE_NAMED_CID(NS_ZH_PSMDETECTOR_CID); |
michael@0 | 49 | NS_DEFINE_NAMED_CID(NS_ZH_STRING_PSMDETECTOR_CID); |
michael@0 | 50 | NS_DEFINE_NAMED_CID(NS_CJK_PSMDETECTOR_CID); |
michael@0 | 51 | NS_DEFINE_NAMED_CID(NS_CJK_STRING_PSMDETECTOR_CID); |
michael@0 | 52 | |
michael@0 | 53 | static const mozilla::Module::CIDEntry kChardetCIDs[] = { |
michael@0 | 54 | { &kNS_UNIVERSAL_DETECTOR_CID, false, nullptr, nsUniversalXPCOMDetectorConstructor }, |
michael@0 | 55 | { &kNS_UNIVERSAL_STRING_DETECTOR_CID, false, nullptr, nsUniversalXPCOMStringDetectorConstructor }, |
michael@0 | 56 | { &kNS_JA_PSMDETECTOR_CID, false, nullptr, nsJAPSMDetectorConstructor }, |
michael@0 | 57 | { &kNS_JA_STRING_PSMDETECTOR_CID, false, nullptr, nsJAStringPSMDetectorConstructor }, |
michael@0 | 58 | { &kNS_KO_PSMDETECTOR_CID, false, nullptr, nsKOPSMDetectorConstructor }, |
michael@0 | 59 | { &kNS_KO_STRING_PSMDETECTOR_CID, false, nullptr, nsKOStringPSMDetectorConstructor }, |
michael@0 | 60 | { &kNS_ZHTW_PSMDETECTOR_CID, false, nullptr, nsZHTWPSMDetectorConstructor }, |
michael@0 | 61 | { &kNS_ZHTW_STRING_PSMDETECTOR_CID, false, nullptr, nsZHTWStringPSMDetectorConstructor }, |
michael@0 | 62 | { &kNS_ZHCN_PSMDETECTOR_CID, false, nullptr, nsZHCNPSMDetectorConstructor }, |
michael@0 | 63 | { &kNS_ZHCN_STRING_PSMDETECTOR_CID, false, nullptr, nsZHCNStringPSMDetectorConstructor }, |
michael@0 | 64 | { &kNS_ZH_PSMDETECTOR_CID, false, nullptr, nsZHPSMDetectorConstructor }, |
michael@0 | 65 | { &kNS_ZH_STRING_PSMDETECTOR_CID, false, nullptr, nsZHStringPSMDetectorConstructor }, |
michael@0 | 66 | { &kNS_CJK_PSMDETECTOR_CID, false, nullptr, nsCJKPSMDetectorConstructor }, |
michael@0 | 67 | { &kNS_CJK_STRING_PSMDETECTOR_CID, false, nullptr, nsCJKStringPSMDetectorConstructor }, |
michael@0 | 68 | { nullptr } |
michael@0 | 69 | }; |
michael@0 | 70 | |
michael@0 | 71 | static const mozilla::Module::ContractIDEntry kChardetContracts[] = { |
michael@0 | 72 | { NS_CHARSET_DETECTOR_CONTRACTID_BASE "universal_charset_detector", &kNS_UNIVERSAL_DETECTOR_CID }, |
michael@0 | 73 | { NS_STRCDETECTOR_CONTRACTID_BASE "universal_charset_detector", &kNS_UNIVERSAL_STRING_DETECTOR_CID }, |
michael@0 | 74 | { NS_CHARSET_DETECTOR_CONTRACTID_BASE "ja_parallel_state_machine", &kNS_JA_PSMDETECTOR_CID }, |
michael@0 | 75 | { NS_STRCDETECTOR_CONTRACTID_BASE "ja_parallel_state_machine", &kNS_JA_STRING_PSMDETECTOR_CID }, |
michael@0 | 76 | { NS_CHARSET_DETECTOR_CONTRACTID_BASE "ko_parallel_state_machine", &kNS_KO_PSMDETECTOR_CID }, |
michael@0 | 77 | { NS_STRCDETECTOR_CONTRACTID_BASE "ko_parallel_state_machine", &kNS_KO_STRING_PSMDETECTOR_CID }, |
michael@0 | 78 | { NS_CHARSET_DETECTOR_CONTRACTID_BASE "zhtw_parallel_state_machine", &kNS_ZHTW_PSMDETECTOR_CID }, |
michael@0 | 79 | { NS_STRCDETECTOR_CONTRACTID_BASE "zhtw_parallel_state_machine", &kNS_ZHTW_STRING_PSMDETECTOR_CID }, |
michael@0 | 80 | { NS_CHARSET_DETECTOR_CONTRACTID_BASE "zhcn_parallel_state_machine", &kNS_ZHCN_PSMDETECTOR_CID }, |
michael@0 | 81 | { NS_STRCDETECTOR_CONTRACTID_BASE "zhcn_parallel_state_machine", &kNS_ZHCN_STRING_PSMDETECTOR_CID }, |
michael@0 | 82 | { NS_CHARSET_DETECTOR_CONTRACTID_BASE "zh_parallel_state_machine", &kNS_ZH_PSMDETECTOR_CID }, |
michael@0 | 83 | { NS_STRCDETECTOR_CONTRACTID_BASE "zh_parallel_state_machine", &kNS_ZH_STRING_PSMDETECTOR_CID }, |
michael@0 | 84 | { NS_CHARSET_DETECTOR_CONTRACTID_BASE "cjk_parallel_state_machine", &kNS_CJK_PSMDETECTOR_CID }, |
michael@0 | 85 | { NS_STRCDETECTOR_CONTRACTID_BASE "cjk_parallel_state_machine", &kNS_CJK_STRING_PSMDETECTOR_CID }, |
michael@0 | 86 | { nullptr } |
michael@0 | 87 | }; |
michael@0 | 88 | |
michael@0 | 89 | static const mozilla::Module::CategoryEntry kChardetCategories[] = { |
michael@0 | 90 | { NS_CHARSET_DETECTOR_CATEGORY, "universal_charset_detector", NS_CHARSET_DETECTOR_CONTRACTID_BASE "universal_charset_detector" }, |
michael@0 | 91 | { NS_CHARSET_DETECTOR_CATEGORY, "ja_parallel_state_machine", NS_CHARSET_DETECTOR_CONTRACTID_BASE "ja_parallel_state_machine" }, |
michael@0 | 92 | { NS_CHARSET_DETECTOR_CATEGORY, "ko_parallel_state_machine", NS_CHARSET_DETECTOR_CONTRACTID_BASE "ko_parallel_state_machine" }, |
michael@0 | 93 | { NS_CHARSET_DETECTOR_CATEGORY, "zhtw_parallel_state_machine", NS_CHARSET_DETECTOR_CONTRACTID_BASE "zhtw_parallel_state_machine" }, |
michael@0 | 94 | { NS_CHARSET_DETECTOR_CATEGORY, "zhcn_parallel_state_machine", NS_CHARSET_DETECTOR_CONTRACTID_BASE "zhcn_parallel_state_machine" }, |
michael@0 | 95 | { NS_CHARSET_DETECTOR_CATEGORY, "zh_parallel_state_machine", NS_CHARSET_DETECTOR_CONTRACTID_BASE "zh_parallel_state_machine" }, |
michael@0 | 96 | { NS_CHARSET_DETECTOR_CATEGORY, "cjk_parallel_state_machine", NS_CHARSET_DETECTOR_CONTRACTID_BASE "cjk_parallel_state_machine" }, |
michael@0 | 97 | { nullptr } |
michael@0 | 98 | }; |
michael@0 | 99 | |
michael@0 | 100 | static const mozilla::Module kChardetModule = { |
michael@0 | 101 | mozilla::Module::kVersion, |
michael@0 | 102 | kChardetCIDs, |
michael@0 | 103 | kChardetContracts, |
michael@0 | 104 | kChardetCategories |
michael@0 | 105 | }; |
michael@0 | 106 | |
michael@0 | 107 | NSMODULE_DEFN(nsUniversalCharDetModule) = &kChardetModule; |