From 37e46b9248b2f2988d382018f847068f0b057319 Mon Sep 17 00:00:00 2001 From: Wilmer Paulino Date: Wed, 13 Jan 2016 17:04:25 -0500 Subject: [PATCH] Bug 1238545 - Remove nsISimpleUnicharStreamFactory; r=froydnj --- parser/htmlparser/nsExpatDriver.cpp | 1 - xpcom/build/XPCOM.h | 1 - xpcom/io/moz.build | 1 - xpcom/io/nsISimpleUnicharStreamFactory.idl | 26 ---------------------- xpcom/io/nsUnicharInputStream.h | 1 - 5 files changed, 30 deletions(-) delete mode 100644 xpcom/io/nsISimpleUnicharStreamFactory.idl diff --git a/parser/htmlparser/nsExpatDriver.cpp b/parser/htmlparser/nsExpatDriver.cpp index 362aa37be381..98e8d02f7775 100644 --- a/parser/htmlparser/nsExpatDriver.cpp +++ b/parser/htmlparser/nsExpatDriver.cpp @@ -13,7 +13,6 @@ #include "nsParserMsgUtils.h" #include "nsIURL.h" #include "nsIUnicharInputStream.h" -#include "nsISimpleUnicharStreamFactory.h" #include "nsIProtocolHandler.h" #include "nsNetUtil.h" #include "prprf.h" diff --git a/xpcom/build/XPCOM.h b/xpcom/build/XPCOM.h index f1d41b431ed9..aed785aaa70d 100644 --- a/xpcom/build/XPCOM.h +++ b/xpcom/build/XPCOM.h @@ -95,7 +95,6 @@ #include "nsIServiceManager.h" #include "nsIScriptableInputStream.h" #include "nsISimpleEnumerator.h" -#include "nsISimpleUnicharStreamFactory.h" #include "nsIStreamBufferAccess.h" #include "nsIStringEnumerator.h" #include "nsIStorageStream.h" diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build index 45732e4cbf2f..93851bfae79b 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build @@ -30,7 +30,6 @@ XPIDL_SOURCES += [ 'nsIScriptableBase64Encoder.idl', 'nsIScriptableInputStream.idl', 'nsISeekableStream.idl', - 'nsISimpleUnicharStreamFactory.idl', 'nsIStorageStream.idl', 'nsIStreamBufferAccess.idl', 'nsIStringStream.idl', diff --git a/xpcom/io/nsISimpleUnicharStreamFactory.idl b/xpcom/io/nsISimpleUnicharStreamFactory.idl deleted file mode 100644 index 188d887cc91d..000000000000 --- a/xpcom/io/nsISimpleUnicharStreamFactory.idl +++ /dev/null @@ -1,26 +0,0 @@ -/* 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 "nsISupports.idl" - -interface nsIInputStream; -interface nsIUnicharInputStream; - -/** - * Factory to create objects that implement nsIUnicharInputStream, - * converting from a unicode string or a UTF-8 stream. - */ -[scriptable, uuid(8238cd2e-e8e3-43e8-b556-56e21389c766)] -interface nsISimpleUnicharStreamFactory : nsISupports -{ - /** - * Create a unicode input stream from a unicode string. - */ - nsIUnicharInputStream createInstanceFromString(in AString aString); - - /** - * Create a unicode stream from an input stream in UTF8. - */ - nsIUnicharInputStream createInstanceFromUTF8Stream(in nsIInputStream aStream); -}; diff --git a/xpcom/io/nsUnicharInputStream.h b/xpcom/io/nsUnicharInputStream.h index 41dbae5803fb..d4631af7ede9 100644 --- a/xpcom/io/nsUnicharInputStream.h +++ b/xpcom/io/nsUnicharInputStream.h @@ -7,7 +7,6 @@ #ifndef nsUnicharInputStream_h__ #define nsUnicharInputStream_h__ -#include "nsISimpleUnicharStreamFactory.h" #include "nsIUnicharInputStream.h" nsresult NS_NewUnicharInputStream(nsIInputStream* aStreamToWrap,