Bug 1068566 - Remove ISO-IR-111. r=emk.
authorHenri Sivonen <hsivonen@hsivonen.fi>
Thu, 18 Sep 2014 14:58:11 +0300
changeset 206054 78cbc38bb43ace192951b7f67ac652bb7bdd2aea
parent 206053 52b0ec2f0522cbc04cda32056802f1e546f3276a
child 206055 c5ce1a6ec7532922c9f74f59bf79cef2d286a620
push id27511
push userkwierso@gmail.com
push dateThu, 18 Sep 2014 22:38:08 +0000
treeherdermozilla-central@c8e325eee9e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemk
bugs1068566
milestone35.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 1068566 - Remove ISO-IR-111. r=emk.
intl/uconv/directory.txt
intl/uconv/moz.build
intl/uconv/nsUConvModule.cpp
intl/uconv/ucvlatin/iso-ir-111.uf
intl/uconv/ucvlatin/iso-ir-111.ut
intl/uconv/ucvlatin/nsISOIR111ToUnicode.cpp
intl/uconv/ucvlatin/nsISOIR111ToUnicode.h
intl/uconv/ucvlatin/nsUnicodeToISOIR111.cpp
intl/uconv/ucvlatin/nsUnicodeToISOIR111.h
toolkit/components/telemetry/Histograms.json
--- a/intl/uconv/directory.txt
+++ b/intl/uconv/directory.txt
@@ -11,17 +11,17 @@ tools      - tools to build the tables u
 util       - utility functions used by the converters
 
 The following directories contain different charset converters:
 
 ucvcn    - Simplified Chinese charsets - GB2312, HZ, ISO-2022-CN, GBK, GB18030
 ucvja    - Japanese charsets - Shift-JIS, ISO-2022-JP, EUC-JP
 ucvko    - Korean charsets - ISO-2022-KR, EUC-KR, Johab
 ucvlatin - Latin charsets and others - ISO-8859-x, CP1250-1258
-                            CP866, 874, ISO-IR-111, KOI8,
+                            CP866, 874, KOI8,
                             Mac charsets, TIS620, UTF16
 ucvtw    - Traditional Chinese charsets Set 1 - Big5
 ucvtw2   - Traditional Chinese charsets Set 2 - EUC-TW
 
 Within the directories containing charset converters:
 
 *.ut - tables used to convert to Unicode from a charset
 *.uf - tables used to convert to a charset from Unicode
--- a/intl/uconv/moz.build
+++ b/intl/uconv/moz.build
@@ -94,17 +94,16 @@ UNIFIED_SOURCES += [
     'ucvlatin/nsISO88596EToUnicode.cpp',
     'ucvlatin/nsISO88596IToUnicode.cpp',
     'ucvlatin/nsISO88596ToUnicode.cpp',
     'ucvlatin/nsISO88597ToUnicode.cpp',
     'ucvlatin/nsISO88598EToUnicode.cpp',
     'ucvlatin/nsISO88598IToUnicode.cpp',
     'ucvlatin/nsISO88598ToUnicode.cpp',
     'ucvlatin/nsISO88599ToUnicode.cpp',
-    'ucvlatin/nsISOIR111ToUnicode.cpp',
     'ucvlatin/nsKOI8RToUnicode.cpp',
     'ucvlatin/nsKOI8UToUnicode.cpp',
     'ucvlatin/nsMacArabicToUnicode.cpp',
     'ucvlatin/nsMacCEToUnicode.cpp',
     'ucvlatin/nsMacCroatianToUnicode.cpp',
     'ucvlatin/nsMacCyrillicToUnicode.cpp',
     'ucvlatin/nsMacDevanagariToUnicode.cpp',
     'ucvlatin/nsMacFarsiToUnicode.cpp',
@@ -140,17 +139,16 @@ UNIFIED_SOURCES += [
     'ucvlatin/nsUnicodeToISO88596.cpp',
     'ucvlatin/nsUnicodeToISO88596E.cpp',
     'ucvlatin/nsUnicodeToISO88596I.cpp',
     'ucvlatin/nsUnicodeToISO88597.cpp',
     'ucvlatin/nsUnicodeToISO88598.cpp',
     'ucvlatin/nsUnicodeToISO88598E.cpp',
     'ucvlatin/nsUnicodeToISO88598I.cpp',
     'ucvlatin/nsUnicodeToISO88599.cpp',
-    'ucvlatin/nsUnicodeToISOIR111.cpp',
     'ucvlatin/nsUnicodeToKOI8R.cpp',
     'ucvlatin/nsUnicodeToKOI8U.cpp',
     'ucvlatin/nsUnicodeToMacCyrillic.cpp',
     'ucvlatin/nsUnicodeToTIS620.cpp',
     'ucvlatin/nsUnicodeToUserDefined.cpp',
     'ucvlatin/nsUnicodeToUTF16.cpp',
     'ucvlatin/nsUserDefinedToUnicode.cpp',
     'ucvlatin/nsUTF16ToUnicode.cpp',
--- a/intl/uconv/nsUConvModule.cpp
+++ b/intl/uconv/nsUConvModule.cpp
@@ -41,17 +41,16 @@
 #include "nsISO88598EToUnicode.h"
 #include "nsISO88598IToUnicode.h"
 #include "nsISO88599ToUnicode.h"
 #include "nsISO885910ToUnicode.h"
 #include "nsISO885913ToUnicode.h"
 #include "nsISO885914ToUnicode.h"
 #include "nsISO885915ToUnicode.h"
 #include "nsISO885916ToUnicode.h"
-#include "nsISOIR111ToUnicode.h"
 #include "nsCP1250ToUnicode.h"
 #include "nsCP1251ToUnicode.h"
 #include "nsCP1253ToUnicode.h"
 #include "nsCP1254ToUnicode.h"
 #include "nsCP1255ToUnicode.h"
 #include "nsCP1256ToUnicode.h"
 #include "nsCP1257ToUnicode.h"
 #include "nsCP1258ToUnicode.h"
@@ -83,17 +82,16 @@
 #include "nsUnicodeToISO88598E.h"
 #include "nsUnicodeToISO88598I.h"
 #include "nsUnicodeToISO88599.h"
 #include "nsUnicodeToISO885910.h"
 #include "nsUnicodeToISO885913.h"
 #include "nsUnicodeToISO885914.h"
 #include "nsUnicodeToISO885915.h"
 #include "nsUnicodeToISO885916.h"
-#include "nsUnicodeToISOIR111.h"
 #include "nsUnicodeToCP1250.h"
 #include "nsUnicodeToCP1251.h"
 #include "nsUnicodeToCP1253.h"
 #include "nsUnicodeToCP1254.h"
 #include "nsUnicodeToCP1255.h"
 #include "nsUnicodeToCP1256.h"
 #include "nsUnicodeToCP1257.h"
 #include "nsUnicodeToCP1258.h"
@@ -167,17 +165,16 @@ NS_UCONV_REG_UNREG("ISO-8859-8", NS_ISO8
 NS_UCONV_REG_UNREG("ISO-8859-8-I", NS_ISO88598ITOUNICODE_CID, NS_UNICODETOISO88598I_CID)
 NS_UCONV_REG_UNREG("ISO-8859-8-E", NS_ISO88598ETOUNICODE_CID, NS_UNICODETOISO88598E_CID)
 NS_UCONV_REG_UNREG("ISO-8859-9", NS_ISO88599TOUNICODE_CID, NS_UNICODETOISO88599_CID)
 NS_UCONV_REG_UNREG("ISO-8859-10", NS_ISO885910TOUNICODE_CID, NS_UNICODETOISO885910_CID)
 NS_UCONV_REG_UNREG("ISO-8859-13", NS_ISO885913TOUNICODE_CID, NS_UNICODETOISO885913_CID)
 NS_UCONV_REG_UNREG("ISO-8859-14", NS_ISO885914TOUNICODE_CID, NS_UNICODETOISO885914_CID)
 NS_UCONV_REG_UNREG("ISO-8859-15", NS_ISO885915TOUNICODE_CID, NS_UNICODETOISO885915_CID)
 NS_UCONV_REG_UNREG("ISO-8859-16", NS_ISO885916TOUNICODE_CID, NS_UNICODETOISO885916_CID)
-NS_UCONV_REG_UNREG("ISO-IR-111", NS_ISOIR111TOUNICODE_CID, NS_UNICODETOISOIR111_CID)
 NS_UCONV_REG_UNREG("windows-1250", NS_CP1250TOUNICODE_CID, NS_UNICODETOCP1250_CID)
 NS_UCONV_REG_UNREG("windows-1251", NS_CP1251TOUNICODE_CID, NS_UNICODETOCP1251_CID)
 NS_UCONV_REG_UNREG("windows-1253", NS_CP1253TOUNICODE_CID, NS_UNICODETOCP1253_CID)
 NS_UCONV_REG_UNREG("windows-1254", NS_CP1254TOUNICODE_CID, NS_UNICODETOCP1254_CID)
 NS_UCONV_REG_UNREG("windows-1255", NS_CP1255TOUNICODE_CID, NS_UNICODETOCP1255_CID)
 NS_UCONV_REG_UNREG("windows-1256", NS_CP1256TOUNICODE_CID, NS_UNICODETOCP1256_CID)
 NS_UCONV_REG_UNREG("windows-1257", NS_CP1257TOUNICODE_CID, NS_UNICODETOCP1257_CID)
 NS_UCONV_REG_UNREG("windows-1258", NS_CP1258TOUNICODE_CID, NS_UNICODETOCP1258_CID)
@@ -343,17 +340,16 @@ NS_DEFINE_NAMED_CID(NS_ISO88598TOUNICODE
 NS_DEFINE_NAMED_CID(NS_ISO88598ITOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_ISO88598ETOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_ISO88599TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_ISO885910TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_ISO885913TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_ISO885914TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_ISO885915TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_ISO885916TOUNICODE_CID);
-NS_DEFINE_NAMED_CID(NS_ISOIR111TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_CP1250TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_CP1251TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_CP1253TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_CP1254TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_CP1255TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_CP1256TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_CP1257TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_CP1258TOUNICODE_CID);
@@ -393,17 +389,16 @@ NS_DEFINE_NAMED_CID(NS_UNICODETOISO88598
 NS_DEFINE_NAMED_CID(NS_UNICODETOISO88598I_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOISO88598E_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOISO88599_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOISO885910_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOISO885913_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOISO885914_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOISO885915_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOISO885916_CID);
-NS_DEFINE_NAMED_CID(NS_UNICODETOISOIR111_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOCP1250_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOCP1251_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOCP1253_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOCP1254_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOCP1255_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOCP1256_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOCP1257_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOCP1258_CID);
@@ -467,17 +462,16 @@ static const mozilla::Module::CIDEntry k
   { &kNS_ISO88598ITOUNICODE_CID, false, nullptr, nsISO88598IToUnicodeConstructor },
   { &kNS_ISO88598ETOUNICODE_CID, false, nullptr, nsISO88598EToUnicodeConstructor },
   { &kNS_ISO88599TOUNICODE_CID, false, nullptr, nsISO88599ToUnicodeConstructor },
   { &kNS_ISO885910TOUNICODE_CID, false, nullptr, nsISO885910ToUnicodeConstructor },
   { &kNS_ISO885913TOUNICODE_CID, false, nullptr, nsISO885913ToUnicodeConstructor },
   { &kNS_ISO885914TOUNICODE_CID, false, nullptr, nsISO885914ToUnicodeConstructor },
   { &kNS_ISO885915TOUNICODE_CID, false, nullptr, nsISO885915ToUnicodeConstructor },
   { &kNS_ISO885916TOUNICODE_CID, false, nullptr, nsISO885916ToUnicodeConstructor },
-  { &kNS_ISOIR111TOUNICODE_CID, false, nullptr, nsISOIR111ToUnicodeConstructor },
   { &kNS_CP1250TOUNICODE_CID, false, nullptr, nsCP1250ToUnicodeConstructor },
   { &kNS_CP1251TOUNICODE_CID, false, nullptr, nsCP1251ToUnicodeConstructor },
   { &kNS_CP1253TOUNICODE_CID, false, nullptr, nsCP1253ToUnicodeConstructor },
   { &kNS_CP1254TOUNICODE_CID, false, nullptr, nsCP1254ToUnicodeConstructor },
   { &kNS_CP1255TOUNICODE_CID, false, nullptr, nsCP1255ToUnicodeConstructor },
   { &kNS_CP1256TOUNICODE_CID, false, nullptr, nsCP1256ToUnicodeConstructor },
   { &kNS_CP1257TOUNICODE_CID, false, nullptr, nsCP1257ToUnicodeConstructor },
   { &kNS_CP1258TOUNICODE_CID, false, nullptr, nsCP1258ToUnicodeConstructor },
@@ -517,17 +511,16 @@ static const mozilla::Module::CIDEntry k
   { &kNS_UNICODETOISO88598I_CID, false, nullptr, nsUnicodeToISO88598IConstructor },
   { &kNS_UNICODETOISO88598E_CID, false, nullptr, nsUnicodeToISO88598EConstructor },
   { &kNS_UNICODETOISO88599_CID, false, nullptr, nsUnicodeToISO88599Constructor },
   { &kNS_UNICODETOISO885910_CID, false, nullptr, nsUnicodeToISO885910Constructor },
   { &kNS_UNICODETOISO885913_CID, false, nullptr, nsUnicodeToISO885913Constructor },
   { &kNS_UNICODETOISO885914_CID, false, nullptr, nsUnicodeToISO885914Constructor },
   { &kNS_UNICODETOISO885915_CID, false, nullptr, nsUnicodeToISO885915Constructor },
   { &kNS_UNICODETOISO885916_CID, false, nullptr, nsUnicodeToISO885916Constructor },
-  { &kNS_UNICODETOISOIR111_CID, false, nullptr, nsUnicodeToISOIR111Constructor },
   { &kNS_UNICODETOCP1250_CID, false, nullptr, nsUnicodeToCP1250Constructor },
   { &kNS_UNICODETOCP1251_CID, false, nullptr, nsUnicodeToCP1251Constructor },
   { &kNS_UNICODETOCP1253_CID, false, nullptr, nsUnicodeToCP1253Constructor },
   { &kNS_UNICODETOCP1254_CID, false, nullptr, nsUnicodeToCP1254Constructor },
   { &kNS_UNICODETOCP1255_CID, false, nullptr, nsUnicodeToCP1255Constructor },
   { &kNS_UNICODETOCP1256_CID, false, nullptr, nsUnicodeToCP1256Constructor },
   { &kNS_UNICODETOCP1257_CID, false, nullptr, nsUnicodeToCP1257Constructor },
   { &kNS_UNICODETOCP1258_CID, false, nullptr, nsUnicodeToCP1258Constructor },
@@ -593,17 +586,16 @@ static const mozilla::Module::ContractID
   { NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-8-I", &kNS_ISO88598ITOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-8-E", &kNS_ISO88598ETOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-9", &kNS_ISO88599TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-10", &kNS_ISO885910TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-13", &kNS_ISO885913TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-14", &kNS_ISO885914TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-15", &kNS_ISO885915TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-16", &kNS_ISO885916TOUNICODE_CID },
-  { NS_UNICODEDECODER_CONTRACTID_BASE "ISO-IR-111", &kNS_ISOIR111TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "windows-1250", &kNS_CP1250TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "windows-1251", &kNS_CP1251TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "windows-1253", &kNS_CP1253TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "windows-1254", &kNS_CP1254TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "windows-1255", &kNS_CP1255TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "windows-1256", &kNS_CP1256TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "windows-1257", &kNS_CP1257TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "windows-1258", &kNS_CP1258TOUNICODE_CID },
@@ -643,17 +635,16 @@ static const mozilla::Module::ContractID
   { NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-8-I", &kNS_UNICODETOISO88598I_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-8-E", &kNS_UNICODETOISO88598E_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-9", &kNS_UNICODETOISO88599_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-10", &kNS_UNICODETOISO885910_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-13", &kNS_UNICODETOISO885913_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-14", &kNS_UNICODETOISO885914_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-15", &kNS_UNICODETOISO885915_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-16", &kNS_UNICODETOISO885916_CID },
-  { NS_UNICODEENCODER_CONTRACTID_BASE "ISO-IR-111", &kNS_UNICODETOISOIR111_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "windows-1250", &kNS_UNICODETOCP1250_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "windows-1251", &kNS_UNICODETOCP1251_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "windows-1253", &kNS_UNICODETOCP1253_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "windows-1254", &kNS_UNICODETOCP1254_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "windows-1255", &kNS_UNICODETOCP1255_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "windows-1256", &kNS_UNICODETOCP1256_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "windows-1257", &kNS_UNICODETOCP1257_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "windows-1258", &kNS_UNICODETOCP1258_CID },
deleted file mode 100644
--- a/intl/uconv/ucvlatin/iso-ir-111.uf
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*========================================================
-  This is a Generated file. Please don't edit it.
-
-  The tool which used to generate this file is called fromu.
-  If you have any problem of this file. Please contact 
-  Netscape Client International Team or 
-  ftang@netscape <Frank Tang> 
-
-              Table in Debug form 
-Begin of Item 0000
- Format 0
-  srcBegin = 0000
-  srcEnd = 00A0
-  destBegin = 0000
-End of Item 0000 
-
-Begin of Item 0001
- Format 0
-  srcBegin = 0404
-  srcEnd = 040C
-  destBegin = 00B4
-End of Item 0001 
-
-Begin of Item 0002
- Format 0
-  srcBegin = 0418
-  srcEnd = 041F
-  destBegin = 00E9
-End of Item 0002 
-
-Begin of Item 0003
- Format 0
-  srcBegin = 0438
-  srcEnd = 043F
-  destBegin = 00C9
-End of Item 0003 
-
-Begin of Item 0004
- Format 0
-  srcBegin = 0454
-  srcEnd = 045C
-  destBegin = 00A4
-End of Item 0004 
-
-Begin of Item 0005
- Format 1
-  srcBegin = 00A4
-  srcEnd = 00AD
-  mappingOffset = 0000
- Mapping  = 
-  00BD FFFD FFFD FFFD FFFD FFFD FFFD FFFD 
-  FFFD 00AD 
-End of Item 0005 
-
-Begin of Item 0006
- Format 1
-  srcBegin = 0401
-  srcEnd = 045F
-  mappingOffset = 000A
- Mapping  = 
-  00B3 00B1 00B2 FFFD FFFD FFFD FFFD FFFD 
-  FFFD FFFD FFFD FFFD FFFD 00BE 00BF 00E1 
-  00E2 00F7 00E7 00E4 00E5 00F6 00FA FFFD 
-  FFFD FFFD FFFD FFFD FFFD FFFD FFFD 00F2 
-  00F3 00F4 00F5 00E6 00E8 00E3 00FE 00FB 
-  00FD 00FF 00F9 00F8 00FC 00E0 00F1 00C1 
-  00C2 00D7 00C7 00C4 00C5 00D6 00DA FFFD 
-  FFFD FFFD FFFD FFFD FFFD FFFD FFFD 00D2 
-  00D3 00D4 00D5 00C6 00C8 00C3 00DE 00DB 
-  00DD 00DF 00D9 00D8 00DC 00C0 00D1 FFFD 
-  00A3 00A1 00A2 FFFD FFFD FFFD FFFD FFFD 
-  FFFD FFFD FFFD FFFD FFFD 00AE 00AF 
-End of Item 0006 
-
-Begin of Item 0007
- Format 2
-  srcBegin = 2116
-  destBegin = 00B0
-End of Item 0007 
-
-========================================================*/
-/* Offset=0x0000  ItemOfList */
-  0x0008,
-/*-------------------------------------------------------*/
-/* Offset=0x0001  offsetToFormatArray */
-  0x0004,
-/*-------------------------------------------------------*/
-/* Offset=0x0002  offsetToMapCellArray */ 
-  0x0007,
-/*-------------------------------------------------------*/
-/* Offset=0x0003  offsetToMappingTable */ 
-  0x001F,
-/*-------------------------------------------------------*/
-/*       Offset=0x0004   Start of Format Array */ 
-/*	Total of Format 0 : 0x0005			 */
-/*	Total of Format 1 : 0x0002			 */
-/*	Total of Format 2 : 0x0001			 */
-/*	Total of Format 3 : 0x0000			 */
-
-0x0000, 0x2110, 0x0000, 
-/*-------------------------------------------------------*/
-/*       Offset=0x0007   Start of MapCell Array */ 
-/* 0000 */    0x0000, 0x00A0, 0x0000, 
-/* 0001 */    0x0404, 0x040C, 0x00B4, 
-/* 0002 */    0x0418, 0x041F, 0x00E9, 
-/* 0003 */    0x0438, 0x043F, 0x00C9, 
-/* 0004 */    0x0454, 0x045C, 0x00A4, 
-/* 0005 */    0x00A4, 0x00AD, 0x0000, 
-/* 0006 */    0x0401, 0x045F, 0x000A, 
-/* 0007 */    0x2116, 0x0000, 0x00B0, 
-/*-------------------------------------------------------*/
-/*       Offset=0x001F   Start of MappingTable */ 
-
-/* 0000 */    0x00BD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0008 */    0xFFFD, 0x00AD, 0x00B3, 0x00B1, 0x00B2, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0010 */    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x00BE, 
-/* 0018 */    0x00BF, 0x00E1, 0x00E2, 0x00F7, 0x00E7, 0x00E4, 0x00E5, 0x00F6, 
-/* 0020 */    0x00FA, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0028 */    0xFFFD, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00E6, 0x00E8, 0x00E3, 
-/* 0030 */    0x00FE, 0x00FB, 0x00FD, 0x00FF, 0x00F9, 0x00F8, 0x00FC, 0x00E0, 
-/* 0038 */    0x00F1, 0x00C1, 0x00C2, 0x00D7, 0x00C7, 0x00C4, 0x00C5, 0x00D6, 
-/* 0040 */    0x00DA, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0048 */    0xFFFD, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00C6, 0x00C8, 0x00C3, 
-/* 0050 */    0x00DE, 0x00DB, 0x00DD, 0x00DF, 0x00D9, 0x00D8, 0x00DC, 0x00C0, 
-/* 0058 */    0x00D1, 0xFFFD, 0x00A3, 0x00A1, 0x00A2, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0060 */    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x00AE, 
-/* 0068 */    0x00AF, 
-/*	End of table Total Length = 0x0088 * 2 */
deleted file mode 100644
--- a/intl/uconv/ucvlatin/iso-ir-111.ut
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*========================================================
-  This is a Generated file. Please don't edit it.
-
-  The tool which used to generate this file is called fromu.
-  If you have any problem of this file. Please contact 
-  Netscape Client International Team or 
-  ftang@netscape <Frank Tang> 
-
-              Table in Debug form 
-Begin of Item 0000
- Format 0
-  srcBegin = 0000
-  srcEnd = 00A0
-  destBegin = 0000
-End of Item 0000 
-
-Begin of Item 0001
- Format 0
-  srcBegin = 00A4
-  srcEnd = 00AC
-  destBegin = 0454
-End of Item 0001 
-
-Begin of Item 0002
- Format 0
-  srcBegin = 00B4
-  srcEnd = 00BC
-  destBegin = 0404
-End of Item 0002 
-
-Begin of Item 0003
- Format 0
-  srcBegin = 00C9
-  srcEnd = 00D0
-  destBegin = 0438
-End of Item 0003 
-
-Begin of Item 0004
- Format 0
-  srcBegin = 00E9
-  srcEnd = 00F0
-  destBegin = 0418
-End of Item 0004 
-
-Begin of Item 0005
- Format 1
-  srcBegin = 00A1
-  srcEnd = 00FF
-  mappingOffset = 0000
- Mapping  = 
-  0452 0453 0451 FFFD FFFD FFFD FFFD FFFD 
-  FFFD FFFD FFFD FFFD 00AD 045E 045F 2116 
-  0402 0403 0401 FFFD FFFD FFFD FFFD FFFD 
-  FFFD FFFD FFFD FFFD 00A4 040E 040F 044E 
-  0430 0431 0446 0434 0435 0444 0433 0445 
-  FFFD FFFD FFFD FFFD FFFD FFFD FFFD FFFD 
-  044F 0440 0441 0442 0443 0436 0432 044C 
-  044B 0437 0448 044D 0449 0447 044A 042E 
-  0410 0411 0426 0414 0415 0424 0413 0425 
-  FFFD FFFD FFFD FFFD FFFD FFFD FFFD FFFD 
-  042F 0420 0421 0422 0423 0416 0412 042C 
-  042B 0417 0428 042D 0429 0427 042A 
-End of Item 0005 
-
-========================================================*/
-/* Offset=0x0000  ItemOfList */
-  0x0006,
-/*-------------------------------------------------------*/
-/* Offset=0x0001  offsetToFormatArray */
-  0x0004,
-/*-------------------------------------------------------*/
-/* Offset=0x0002  offsetToMapCellArray */ 
-  0x0006,
-/*-------------------------------------------------------*/
-/* Offset=0x0003  offsetToMappingTable */ 
-  0x0018,
-/*-------------------------------------------------------*/
-/*       Offset=0x0004   Start of Format Array */ 
-/*	Total of Format 0 : 0x0005			 */
-/*	Total of Format 1 : 0x0001			 */
-/*	Total of Format 2 : 0x0000			 */
-/*	Total of Format 3 : 0x0000			 */
-
-0x0000, 0x0010, 
-/*-------------------------------------------------------*/
-/*       Offset=0x0006   Start of MapCell Array */ 
-/* 0000 */    0x0000, 0x00A0, 0x0000, 
-/* 0001 */    0x00A4, 0x00AC, 0x0454, 
-/* 0002 */    0x00B4, 0x00BC, 0x0404, 
-/* 0003 */    0x00C9, 0x00D0, 0x0438, 
-/* 0004 */    0x00E9, 0x00F0, 0x0418, 
-/* 0005 */    0x00A1, 0x00FF, 0x0000, 
-/*-------------------------------------------------------*/
-/*       Offset=0x0018   Start of MappingTable */ 
-
-/* 0000 */    0x0452, 0x0453, 0x0451, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0008 */    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x00AD, 0x045E, 0x045F, 0x2116, 
-/* 0010 */    0x0402, 0x0403, 0x0401, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0018 */    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x00A4, 0x040E, 0x040F, 0x044E, 
-/* 0020 */    0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, 0x0445, 
-/* 0028 */    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0030 */    0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, 0x044C, 
-/* 0038 */    0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A, 0x042E, 
-/* 0040 */    0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, 0x0425, 
-/* 0048 */    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0050 */    0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, 0x042C, 
-/* 0058 */    0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A, 
-/*	End of table Total Length = 0x0077 * 2 */
deleted file mode 100644
--- a/intl/uconv/ucvlatin/nsISOIR111ToUnicode.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsUCConstructors.h"
-#include "nsISOIR111ToUnicode.h"
-#include "mozilla/Telemetry.h"
-
-using namespace mozilla;
-
-//----------------------------------------------------------------------
-// Global functions and data [declaration]
-
-nsresult
-nsISOIR111ToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID,
-                               void **aResult) 
-{
-  static const uint16_t g_utMappingTable[] = {
-#include "iso-ir-111.ut"
-  };
-
-  Telemetry::Accumulate(Telemetry::DECODER_INSTANTIATED_ISOIR111, true);
-  return CreateOneByteDecoder((uMappingTable*) &g_utMappingTable,
-                              aOuter, aIID, aResult);
-}
deleted file mode 100644
--- a/intl/uconv/ucvlatin/nsISOIR111ToUnicode.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsISOIR111ToUnicode_h___
-#define nsISOIR111ToUnicode_h___
-
-#include "nsISupports.h"
-
-/**
- * A character set converter from ISOIR111 to Unicode.
- *
- * @created         23/Nov/1998
- * @author  Catalin Rotaru [CATA]
- */
-nsresult
-nsISOIR111ToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID,
-                               void **aResult);
-
-#endif /* nsISOIR111ToUnicode_h___ */
deleted file mode 100644
--- a/intl/uconv/ucvlatin/nsUnicodeToISOIR111.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsUCConstructors.h"
-#include "nsUnicodeToISOIR111.h"
-
-//----------------------------------------------------------------------
-// Global functions and data [declaration]
-
-nsresult
-nsUnicodeToISOIR111Constructor(nsISupports *aOuter, REFNSIID aIID,
-                               void **aResult) 
-{
-  static const uint16_t g_ufMappingTable[] = {
-#include "iso-ir-111.uf"
-  };
-
-  return CreateTableEncoder(u1ByteCharset,
-                            (uMappingTable*) &g_ufMappingTable, 1,
-                            aOuter, aIID, aResult);
-}
deleted file mode 100644
--- a/intl/uconv/ucvlatin/nsUnicodeToISOIR111.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsUnicodeToISOIR111_h___
-#define nsUnicodeToISOIR111_h___
-
-#include "nsISupports.h"
-
-/**
- * A character set converter from Unicode to ISOIR111.
- *
- * @created         17/Feb/1999
- * @author  Catalin Rotaru [CATA]
- */
-nsresult
-nsUnicodeToISOIR111Constructor(nsISupports *aOuter, REFNSIID aIID,
-                               void **aResult);
-
-#endif /* nsUnicodeToISOIR111_h___ */
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3973,17 +3973,17 @@
     "description": "Whether the decoder for MACGUJARATI has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_MACGURMUKHI": {
     "expires_in_version": "40",
     "kind": "flag",
     "description": "Whether the decoder for MACGURMUKHI has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_ISOIR111": {
-    "expires_in_version": "40",
+    "expires_in_version": "38",
     "kind": "flag",
     "description": "Whether the decoder for ISOIR111 has been instantiated in this session."
   },
   "DECODER_INSTANTIATED_ARMSCII8": {
     "expires_in_version": "default",
     "kind": "flag",
     "description": "Whether the decoder for ARMSCII8 has been instantiated in this session."
   },