Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove nsDebugDetector. Bug 683429, r=smontagu

Browse Source
This commit is contained in:
David Zbarsky 2012-02-14 12:04:51 +02:00
parent f1793a6e3a
commit 35c6311848
5 changed files with 0 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intl/chardet/src/Makefile.in
View File

@ -53,7 +53,6 @@ LIBXUL_LIBRARY = 1
CPPSRCS = \
nsObserverBase.cpp \
nsDebugDetector.cpp \
nsCyrillicDetector.cpp \
nsChardetModule.cpp \
$(NULL)

7
intl/chardet/src/nsCharDetConstructors.h
View File

@ -57,11 +57,4 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUKProbDetector)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsRUStringProbDetector)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUKStringProbDetector)
#ifdef INCLUDE_DBGDETECTOR
NS_GENERIC_FACTORY_CONSTRUCTOR(ns1stBlkDbgDetector)
NS_GENERIC_FACTORY_CONSTRUCTOR(ns2ndBlkDbgDetector)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLastBlkDbgDetector)
#endif /* INCLUDE_DBGDETECTOR */
#endif

15
intl/chardet/src/nsChardetModule.cpp
View File

@ -46,22 +46,12 @@ NS_DEFINE_NAMED_CID(NS_RU_PROBDETECTOR_CID);
NS_DEFINE_NAMED_CID(NS_UK_PROBDETECTOR_CID);
NS_DEFINE_NAMED_CID(NS_RU_STRING_PROBDETECTOR_CID);
NS_DEFINE_NAMED_CID(NS_UK_STRING_PROBDETECTOR_CID);
#ifdef INCLUDE_DBGDETECTOR
NS_DEFINE_NAMED_CID(NS_1STBLKDBG_DETECTOR_CID);
NS_DEFINE_NAMED_CID(NS_2NDBLKDBG_DETECTOR_CID);
NS_DEFINE_NAMED_CID(NS_LASTBLKDBG_DETECTOR_CID);
#endif /* INCLUDE_DBGDETECTOR */
static const mozilla::Module::CIDEntry kChardetCIDs[] = {
{ &kNS_RU_PROBDETECTOR_CID, false, NULL, nsRUProbDetectorConstructor },
{ &kNS_UK_PROBDETECTOR_CID, false, NULL, nsUKProbDetectorConstructor },
{ &kNS_RU_STRING_PROBDETECTOR_CID, false, NULL, nsRUStringProbDetectorConstructor },
{ &kNS_UK_STRING_PROBDETECTOR_CID, false, NULL, nsUKStringProbDetectorConstructor },
#ifdef INCLUDE_DBGDETECTOR
{ &kNS_1STBLKDBG_DETECTOR_CID, false, NULL, ns1stBlkDbgDetectorConstructor },
{ &kNS_2NDBLKDBG_DETECTOR_CID, false, NULL, ns2ndBlkDbgDetectorConstructor },
{ &kNS_LASTBLKDBG_DETECTOR_CID, false, NULL, nsLastBlkDbgDetectorConstructor },
#endif /* INCLUDE_DBGDETECTOR */
{ NULL }
};
@ -70,11 +60,6 @@ static const mozilla::Module::ContractIDEntry kChardetContracts[] = {
{ NS_CHARSET_DETECTOR_CONTRACTID_BASE "ukprob", &kNS_UK_PROBDETECTOR_CID },
{ NS_STRCDETECTOR_CONTRACTID_BASE "ruprob", &kNS_RU_STRING_PROBDETECTOR_CID },
{ NS_STRCDETECTOR_CONTRACTID_BASE "ukprob", &kNS_UK_STRING_PROBDETECTOR_CID },
#ifdef INCLUDE_DBGDETECTOR
{ NS_CHARSET_DETECTOR_CONTRACTID_BASE "1stblkdbg", &kNS_1STBLKDBG_DETECTOR_CID },
{ NS_CHARSET_DETECTOR_CONTRACTID_BASE "2ndblkdbg", &kNS_2NDBLKDBG_DETECTOR_CID },
{ NS_CHARSET_DETECTOR_CONTRACTID_BASE "lastblkdbg", &kNS_LASTBLKDBG_DETECTOR_CID },
#endif /* INCLUDE_DBGDETECTOR */
{ NULL }
};

109
intl/chardet/src/nsDebugDetector.cpp
View File

@ -1,109 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsDebugDetector.h"
#include "pratom.h"
#include "nsCharDetDll.h"
#define REPORT_CHARSET "ISO-8859-7"
#define REPORT_CONFIDENT eSureAnswer
//--------------------------------------------------------------------
nsDebugDetector::nsDebugDetector( nsDebugDetectorSel aSel)
{
mSel = aSel;
mBlks = 0;
mObserver = nsnull;
mStop = false;
}
//--------------------------------------------------------------------
nsDebugDetector::~nsDebugDetector()
{
}
//--------------------------------------------------------------------
NS_IMETHODIMP nsDebugDetector::Init(nsICharsetDetectionObserver* aObserver)
{
NS_ASSERTION(mObserver == nsnull , "Init twice");
if(nsnull == aObserver)
return NS_ERROR_ILLEGAL_VALUE;
mObserver = aObserver;
return NS_OK;
}
//--------------------------------------------------------------------
NS_IMETHODIMP nsDebugDetector::DoIt(const char* aBytesArray, PRUint32 aLen, bool* oDontFeedMe)
{
NS_ASSERTION(mObserver != nsnull , "have not init yet");
NS_ASSERTION(!mStop , "don't call DoIt if we return true in oDontFeedMe");
if((nsnull == aBytesArray) || (nsnull == oDontFeedMe))
return NS_ERROR_ILLEGAL_VALUE;
mBlks++;
if((k1stBlk == mSel) && (1 == mBlks)) {
*oDontFeedMe = mStop = true;
Report();
} else if((k2ndBlk == mSel) && (2 == mBlks)) {
*oDontFeedMe = mStop = true;
Report();
} else {
*oDontFeedMe = mStop = false;
}
return NS_OK;
}
//--------------------------------------------------------------------
NS_IMETHODIMP nsDebugDetector::Done()
{
NS_ASSERTION(mObserver != nsnull , "have not init yet");
if(klastBlk == mSel)
Report();
return NS_OK;
}
//--------------------------------------------------------------------
void nsDebugDetector::Report()
{
mObserver->Notify( REPORT_CHARSET, REPORT_CONFIDENT);
}
NS_IMPL_ISUPPORTS1(nsDebugDetector, nsICharsetDetector)

107
intl/chardet/src/nsDebugDetector.h
View File

@ -1,107 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef nsDebugDetector_h__
#define nsDebugDetector_h__
#include "nsIFactory.h"
#include "nsICharsetDetector.h"
// {12BB8F18-2389-11d3-B3BF-00805F8A6670}
#define NS_1STBLKDBG_DETECTOR_CID \
{ 0x12bb8f18, 0x2389, 0x11d3, { 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 } }
// {12BB8F19-2389-11d3-B3BF-00805F8A6670}
#define NS_2NDBLKDBG_DETECTOR_CID \
{ 0x12bb8f19, 0x2389, 0x11d3, { 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 } }
// {12BB8F1A-2389-11d3-B3BF-00805F8A6670}
#define NS_LASTBLKDBG_DETECTOR_CID \
{ 0x12bb8f1a, 0x2389, 0x11d3, { 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 } }
typedef enum {
k1stBlk,
k2ndBlk,
klastBlk
} nsDebugDetectorSel;
class nsDebugDetector : public nsICharsetDetector
{
NS_DECL_ISUPPORTS
public:
nsDebugDetector(nsDebugDetectorSel aSel);
virtual ~nsDebugDetector();
NS_IMETHOD Init(nsICharsetDetectionObserver* aObserver);
NS_IMETHOD DoIt(const char* aBytesArray, PRUint32 aLen, bool* oDontFeedMe);
NS_IMETHOD Done();
protected:
virtual void Report();
private:
PRInt32 mBlks;
nsDebugDetectorSel mSel;
nsICharsetDetectionObserver* mObserver;
bool mStop;
};
class ns1stBlkDbgDetector : public nsDebugDetector
{
public:
ns1stBlkDbgDetector () : nsDebugDetector(k1stBlk) {}
};
class ns2ndBlkDbgDetector : public nsDebugDetector
{
public:
ns2ndBlkDbgDetector () : nsDebugDetector(k2ndBlk) {}
};
class nsLastBlkDbgDetector : public nsDebugDetector
{
public:
nsLastBlkDbgDetector () : nsDebugDetector(klastBlk) {}
};
#endif // nsDebugDetector_h__