From 6d50f11ec788343c48d0aa8b0abf573c8791c8ae Mon Sep 17 00:00:00 2001
From: Chi-chi Wang <chichi@wangchiyi.com>
Date: Fri, 12 Oct 2018 13:32:55 -0500
Subject: [PATCH 1/2] src: remove function hasTextDecoder in encoding.js

---
 lib/internal/encoding.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
index b2448144b0854a..4ab8557edc2bcd 100644
--- a/lib/internal/encoding.js
+++ b/lib/internal/encoding.js
@@ -341,16 +341,11 @@ Object.defineProperties(
       value: 'TextEncoder'
     } });
 
-const { hasConverter, TextDecoder } =
+const { TextDecoder } =
   process.binding('config').hasIntl ?
     makeTextDecoderICU() :
     makeTextDecoderJS();
 
-function hasTextDecoder(encoding = 'utf-8') {
-  validateArgument(encoding, 'string', 'encoding', 'string');
-  return hasConverter(getEncodingFromLabel(encoding));
-}
-
 function makeTextDecoderICU() {
   const {
     decode: _decode,
@@ -552,7 +547,6 @@ function makeTextDecoderJS() {
 
 module.exports = {
   getEncodingFromLabel,
-  hasTextDecoder,
   TextDecoder,
   TextEncoder
 };

From 4e92f72719f8b58a24b81edb0630ea09b6022db3 Mon Sep 17 00:00:00 2001
From: Chi-chi Wang <chichi@wangchiyi.com>
Date: Fri, 12 Oct 2018 17:06:23 -0500
Subject: [PATCH 2/2] src: return TextDecoder directly from factories

---
 lib/internal/encoding.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
index 4ab8557edc2bcd..c0083948e0d72d 100644
--- a/lib/internal/encoding.js
+++ b/lib/internal/encoding.js
@@ -341,7 +341,7 @@ Object.defineProperties(
       value: 'TextEncoder'
     } });
 
-const { TextDecoder } =
+const TextDecoder =
   process.binding('config').hasIntl ?
     makeTextDecoderICU() :
     makeTextDecoderJS();
@@ -350,7 +350,6 @@ function makeTextDecoderICU() {
   const {
     decode: _decode,
     getConverter,
-    hasConverter
   } = internalBinding('icu');
 
   class TextDecoder {
@@ -404,7 +403,7 @@ function makeTextDecoderICU() {
     }
   }
 
-  return { hasConverter, TextDecoder };
+  return TextDecoder;
 }
 
 function makeTextDecoderJS() {
@@ -492,7 +491,7 @@ function makeTextDecoderJS() {
     }
   }
 
-  return { hasConverter, TextDecoder };
+  return TextDecoder;
 }
 
 // Mix in some shared properties.