зеркало из https://github.com/mozilla/pjs.git
separate xpcom wrapper and charset detectors : patch by shanjian with some updates by me (r=smontagu, sr=alecf)
This commit is contained in:
jshin%mailaps.org
Родитель
ec71902dc3
Коммит
be6203502f
|
|
@ -81,7 +81,8 @@ CPPSRCS = \
|
|||
nsLatin1Prober.cpp \
|
||||
nsUniversalCharDetModule.cpp \
|
||||
nsUniversalDetector.cpp \
|
||||
$(NULL)
|
||||
nsUdetXPCOMWrapper.cpp \
|
||||
$(NULL)
|
||||
|
||||
# Not built on win32. Not sure why not
|
||||
ifneq ($(OS_ARCH),WINNT)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,156 @@
|
|||
/* -*- Mode: C++; tab-width: 2; 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 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 "nscore.h"
|
||||
|
||||
#include "nsUniversalDetector.h"
|
||||
#include "nsUdetXPCOMWrapper.h"
|
||||
|
||||
#include "nsUniversalCharDetDll.h"
|
||||
//---- for XPCOM
|
||||
#include "nsIFactory.h"
|
||||
#include "nsISupports.h"
|
||||
#include "pratom.h"
|
||||
#include "prmem.h"
|
||||
#include "nsCOMPtr.h"
|
||||
|
||||
static NS_DEFINE_CID(kUniversalDetectorCID, NS_UNIVERSAL_DETECTOR_CID);
|
||||
static NS_DEFINE_CID(kUniversalStringDetectorCID, NS_UNIVERSAL_STRING_DETECTOR_CID);
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
nsUniversalXPCOMDetector:: nsUniversalXPCOMDetector() : nsUniversalDetector()
|
||||
{
|
||||
}
|
||||
//---------------------------------------------------------------------
|
||||
nsUniversalXPCOMDetector::~nsUniversalXPCOMDetector()
|
||||
{
|
||||
}
|
||||
//---------------------------------------------------------------------
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsUniversalXPCOMDetector, nsICharsetDetector)
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
NS_IMETHODIMP nsUniversalXPCOMDetector::Init(
|
||||
nsICharsetDetectionObserver* aObserver)
|
||||
{
|
||||
NS_ASSERTION(mObserver == nsnull , "Init twice");
|
||||
if(nsnull == aObserver)
|
||||
return NS_ERROR_ILLEGAL_VALUE;
|
||||
|
||||
mObserver = aObserver;
|
||||
return NS_OK;
|
||||
}
|
||||
//----------------------------------------------------------
|
||||
NS_IMETHODIMP nsUniversalXPCOMDetector::DoIt(const char* aBuf,
|
||||
PRUint32 aLen, PRBool* oDontFeedMe)
|
||||
{
|
||||
NS_ASSERTION(mObserver != nsnull , "have not init yet");
|
||||
|
||||
if((nsnull == aBuf) || (nsnull == oDontFeedMe))
|
||||
return NS_ERROR_ILLEGAL_VALUE;
|
||||
|
||||
nsresult rv = this->HandleData(aBuf, aLen);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
if (mDone)
|
||||
{
|
||||
if (mDetectedCharset)
|
||||
Report(mDetectedCharset);
|
||||
|
||||
*oDontFeedMe = PR_TRUE;
|
||||
}
|
||||
*oDontFeedMe = PR_FALSE;
|
||||
return NS_OK;
|
||||
}
|
||||
//----------------------------------------------------------
|
||||
NS_IMETHODIMP nsUniversalXPCOMDetector::Done()
|
||||
{
|
||||
NS_ASSERTION(mObserver != nsnull , "have not init yet");
|
||||
this->DataEnd();
|
||||
return NS_OK;
|
||||
}
|
||||
//----------------------------------------------------------
|
||||
void nsUniversalXPCOMDetector::Report(const char* aCharset)
|
||||
{
|
||||
NS_ASSERTION(mObserver != nsnull , "have not init yet");
|
||||
#ifdef DEBUG_chardet
|
||||
printf("Universal Charset Detector report charset %s . \r\n", aCharset);
|
||||
for (PRInt32 i = 0; i < NUM_OF_CHARSET_PROBERS; i++)
|
||||
mCharSetProbers[i]->DumpStatus();
|
||||
#endif
|
||||
mObserver->Notify(aCharset, eBestAnswer);
|
||||
}
|
||||
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
nsUniversalXPCOMStringDetector:: nsUniversalXPCOMStringDetector()
|
||||
: nsUniversalDetector()
|
||||
{
|
||||
}
|
||||
//---------------------------------------------------------------------
|
||||
nsUniversalXPCOMStringDetector::~nsUniversalXPCOMStringDetector()
|
||||
{
|
||||
}
|
||||
//---------------------------------------------------------------------
|
||||
NS_IMPL_ISUPPORTS1(nsUniversalXPCOMStringDetector, nsIStringCharsetDetector)
|
||||
//---------------------------------------------------------------------
|
||||
void nsUniversalXPCOMStringDetector::Report(const char *aCharset)
|
||||
{
|
||||
mResult = aCharset;
|
||||
#ifdef DEBUG_chardet
|
||||
printf("New Charset Prober report charset %s . \r\n", aCharset);
|
||||
#endif
|
||||
}
|
||||
//---------------------------------------------------------------------
|
||||
NS_IMETHODIMP nsUniversalXPCOMStringDetector::DoIt(const char* aBuf,
|
||||
PRUint32 aLen, const char** oCharset,
|
||||
nsDetectionConfident &oConf)
|
||||
{
|
||||
mResult = nsnull;
|
||||
this->Reset();
|
||||
nsresult rv = this->HandleData(aBuf, aLen);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
this->DataEnd();
|
||||
if (mResult)
|
||||
{
|
||||
*oCharset=mResult;
|
||||
oConf = eBestAnswer;
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; 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 Communicator client 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 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 "nsICharsetAlias.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsIModule.h"
|
||||
|
||||
#include "nspr.h"
|
||||
#include "nsString.h"
|
||||
#include "pratom.h"
|
||||
#include "nsUniversalCharDetDll.h"
|
||||
#include "nsISupports.h"
|
||||
#include "nsICategoryManager.h"
|
||||
#include "nsIComponentManager.h"
|
||||
#include "nsIFactory.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsICharsetDetector.h"
|
||||
#include "nsIStringCharsetDetector.h"
|
||||
#include "nsIGenericFactory.h"
|
||||
|
||||
#include "nsUniversalDetector.h"
|
||||
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUniversalXPCOMDetector)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUniversalXPCOMStringDetector)
|
||||
|
||||
//----------------------------------------
|
||||
static NS_METHOD nsUniversalCharDetectorRegistrationProc(nsIComponentManager *aCompMgr,
|
||||
nsIFile *aPath,
|
||||
const char *registryLocation,
|
||||
const char *componentType,
|
||||
const nsModuleComponentInfo *info)
|
||||
{
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsICategoryManager>
|
||||
categoryManager(do_GetService("@mozilla.org/categorymanager;1", &rv));
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
return categoryManager->AddCategoryEntry(NS_CHARSET_DETECTOR_CATEGORY,
|
||||
"universal_charset_detector",
|
||||
info->mContractID,
|
||||
PR_TRUE, PR_TRUE,
|
||||
nsnull);
|
||||
}
|
||||
|
||||
// Component Table
|
||||
static const nsModuleComponentInfo components[] =
|
||||
{
|
||||
{ "Universal Charset Detector", NS_UNIVERSAL_DETECTOR_CID,
|
||||
NS_CHARSET_DETECTOR_CONTRACTID_BASE "universal_charset_detector", nsUniversalXPCOMDetectorConstructor,
|
||||
nsUniversalCharDetectorRegistrationProc, NULL},
|
||||
{ "Universal String Charset Detector", NS_UNIVERSAL_STRING_DETECTOR_CID,
|
||||
NS_STRCDETECTOR_CONTRACTID_BASE "universal_charset_detector", nsUniversalXPCOMStringDetectorConstructor,
|
||||
NULL, NULL}
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(nsUniversalCharDetModule, components)
|
||||
|
|
@ -36,18 +36,9 @@
|
|||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nscore.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#include "nsUniversalDetector.h"
|
||||
|
||||
#include "nsUniversalCharDetDll.h"
|
||||
//---- for XPCOM
|
||||
#include "nsIFactory.h"
|
||||
#include "nsISupports.h"
|
||||
#include "pratom.h"
|
||||
#include "prmem.h"
|
||||
#include "nsCOMPtr.h"
|
||||
|
||||
#include "nsMBCSGroupProber.h"
|
||||
#include "nsSBCSGroupProber.h"
|
||||
#include "nsEscCharsetProber.h"
|
||||
|
|
@ -285,113 +276,3 @@ void nsUniversalDetector::DataEnd()
|
|||
}
|
||||
return;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
nsUniversalXPCOMDetector:: nsUniversalXPCOMDetector()
|
||||
: nsUniversalDetector()
|
||||
{
|
||||
mObserver = nsnull;
|
||||
}
|
||||
//---------------------------------------------------------------------
|
||||
nsUniversalXPCOMDetector::~nsUniversalXPCOMDetector()
|
||||
{
|
||||
NS_IF_RELEASE(mObserver);
|
||||
}
|
||||
//---------------------------------------------------------------------
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsUniversalXPCOMDetector, nsICharsetDetector)
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
NS_IMETHODIMP nsUniversalXPCOMDetector::Init(
|
||||
nsICharsetDetectionObserver* aObserver)
|
||||
{
|
||||
NS_ASSERTION(mObserver == nsnull , "Init twice");
|
||||
if(nsnull == aObserver)
|
||||
return NS_ERROR_ILLEGAL_VALUE;
|
||||
|
||||
NS_IF_ADDREF(aObserver);
|
||||
mObserver = aObserver;
|
||||
return NS_OK;
|
||||
}
|
||||
//----------------------------------------------------------
|
||||
NS_IMETHODIMP nsUniversalXPCOMDetector::DoIt(
|
||||
const char* aBuf, PRUint32 aLen, PRBool* oDontFeedMe)
|
||||
{
|
||||
NS_ASSERTION(mObserver != nsnull , "have not init yet");
|
||||
|
||||
if((nsnull == aBuf) || (nsnull == oDontFeedMe))
|
||||
return NS_ERROR_ILLEGAL_VALUE;
|
||||
|
||||
nsresult rv = this->HandleData(aBuf, aLen);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
if (mDone)
|
||||
{
|
||||
if (mDetectedCharset)
|
||||
{
|
||||
Report(mDetectedCharset);
|
||||
}
|
||||
*oDontFeedMe = PR_TRUE;
|
||||
}
|
||||
*oDontFeedMe = PR_FALSE;
|
||||
return NS_OK;
|
||||
}
|
||||
//----------------------------------------------------------
|
||||
NS_IMETHODIMP nsUniversalXPCOMDetector::Done()
|
||||
{
|
||||
NS_ASSERTION(mObserver != nsnull , "have not init yet");
|
||||
this->DataEnd();
|
||||
return NS_OK;
|
||||
}
|
||||
//----------------------------------------------------------
|
||||
void nsUniversalXPCOMDetector::Report(const char* aCharset)
|
||||
{
|
||||
NS_ASSERTION(mObserver != nsnull , "have not init yet");
|
||||
#ifdef DEBUG_chardet
|
||||
printf("Universal Charset Detector report charset %s . \r\n", aCharset);
|
||||
for (PRInt32 i = 0; i < NUM_OF_CHARSET_PROBERS; i++)
|
||||
mCharSetProbers[i]->DumpStatus();
|
||||
#endif
|
||||
mObserver->Notify(aCharset, eBestAnswer);
|
||||
}
|
||||
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
nsUniversalXPCOMStringDetector:: nsUniversalXPCOMStringDetector()
|
||||
: nsUniversalDetector()
|
||||
{
|
||||
}
|
||||
//---------------------------------------------------------------------
|
||||
nsUniversalXPCOMStringDetector::~nsUniversalXPCOMStringDetector()
|
||||
{
|
||||
}
|
||||
//---------------------------------------------------------------------
|
||||
NS_IMPL_ISUPPORTS1(nsUniversalXPCOMStringDetector, nsIStringCharsetDetector)
|
||||
//---------------------------------------------------------------------
|
||||
void nsUniversalXPCOMStringDetector::Report(const char *aCharset)
|
||||
{
|
||||
mResult = aCharset;
|
||||
#ifdef DEBUG_chardet
|
||||
printf("New Charset Prober report charset %s . \r\n", aCharset);
|
||||
#endif
|
||||
}
|
||||
//---------------------------------------------------------------------
|
||||
NS_IMETHODIMP nsUniversalXPCOMStringDetector::DoIt(const char* aBuf, PRUint32 aLen,
|
||||
const char** oCharset, nsDetectionConfident &oConf)
|
||||
{
|
||||
mResult = nsnull;
|
||||
this->Reset();
|
||||
nsresult rv = this->HandleData(aBuf, aLen);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
this->DataEnd();
|
||||
if (mResult)
|
||||
{
|
||||
*oCharset=mResult;
|
||||
oConf = eBestAnswer;
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,126 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; 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 Communicator client 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 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 nsUniversalDetector_h__
|
||||
#define nsUniversalDetector_h__
|
||||
|
||||
#include "nsISupports.h"
|
||||
#include "nsICharsetDetector.h"
|
||||
#include "nsIStringCharsetDetector.h"
|
||||
#include "nsICharsetDetectionObserver.h"
|
||||
|
||||
#include "nsIFactory.h"
|
||||
|
||||
// {374E0CDE-F605-4259-8C92-E639C6C2EEEF}
|
||||
#define NS_UNIVERSAL_DETECTOR_CID \
|
||||
{ 0x374e0cde, 0xf605, 0x4259, { 0x8c, 0x92, 0xe6, 0x39, 0xc6, 0xc2, 0xee, 0xef } }
|
||||
|
||||
// {6EE5301A-3981-49bd-85F8-1A2CC228CF3E}
|
||||
#define NS_UNIVERSAL_STRING_DETECTOR_CID \
|
||||
{ 0x6ee5301a, 0x3981, 0x49bd, { 0x85, 0xf8, 0x1a, 0x2c, 0xc2, 0x28, 0xcf, 0x3e } }
|
||||
|
||||
class nsCharSetProber;
|
||||
|
||||
#define NUM_OF_CHARSET_PROBERS 3
|
||||
|
||||
typedef enum {
|
||||
ePureAscii = 0,
|
||||
eEscAscii = 1,
|
||||
eHighbyte = 2
|
||||
} nsInputState;
|
||||
|
||||
class nsUniversalDetector {
|
||||
public:
|
||||
nsUniversalDetector();
|
||||
virtual ~nsUniversalDetector();
|
||||
virtual nsresult HandleData(const char* aBuf, PRUint32 aLen);
|
||||
virtual void DataEnd(void);
|
||||
|
||||
protected:
|
||||
virtual void Report(const char* aCharset) = 0;
|
||||
virtual void Reset();
|
||||
nsInputState mInputState;
|
||||
PRBool mDone;
|
||||
PRBool mInTag;
|
||||
PRBool mStart;
|
||||
PRBool mGotData;
|
||||
char mLastChar;
|
||||
const char * mDetectedCharset;
|
||||
PRInt32 mBestGuess;
|
||||
|
||||
nsCharSetProber *mCharSetProbers[NUM_OF_CHARSET_PROBERS];
|
||||
nsCharSetProber *mEscCharSetProber;
|
||||
};
|
||||
|
||||
//=====================================================================
|
||||
class nsUniversalXPCOMDetector :
|
||||
public nsUniversalDetector,
|
||||
public nsICharsetDetector
|
||||
{
|
||||
NS_DECL_ISUPPORTS
|
||||
public:
|
||||
nsUniversalXPCOMDetector();
|
||||
virtual ~nsUniversalXPCOMDetector();
|
||||
NS_IMETHOD Init(nsICharsetDetectionObserver* aObserver);
|
||||
NS_IMETHOD DoIt(const char* aBuf, PRUint32 aLen, PRBool *oDontFeedMe);
|
||||
NS_IMETHOD Done();
|
||||
protected:
|
||||
virtual void Report(const char* aCharset);
|
||||
private:
|
||||
nsICharsetDetectionObserver* mObserver;
|
||||
};
|
||||
|
||||
//=====================================================================
|
||||
class nsUniversalXPCOMStringDetector :
|
||||
public nsUniversalDetector,
|
||||
public nsIStringCharsetDetector
|
||||
{
|
||||
NS_DECL_ISUPPORTS
|
||||
public:
|
||||
nsUniversalXPCOMStringDetector();
|
||||
virtual ~nsUniversalXPCOMStringDetector();
|
||||
NS_IMETHOD DoIt(const char* aBuf, PRUint32 aLen,
|
||||
const char** oCharset, nsDetectionConfident &oConf);
|
||||
protected:
|
||||
virtual void Report(const char* aCharset);
|
||||
private:
|
||||
nsICharsetDetectionObserver* mObserver;
|
||||
const char* mResult;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Загрузка…
Ссылка в новой задаче