зеркало из https://github.com/mozilla/gecko-dev.git
Convert users of nsAReadable[C]String and nsAWritable[C]String typedefs to [const] nsA[C]String. b=131899 r=scc sr=jag a=asa
This commit is contained in:
dbaron%fas.harvard.edu
Родитель
f2747806e2
Коммит
6cdcd7ef3a
|
|
@ -58,7 +58,7 @@ public:
|
|||
NS_IMETHOD GetPopupNode(nsIDOMNode** aNode)=0;
|
||||
NS_IMETHOD SetPopupNode(nsIDOMNode* aNode)=0;
|
||||
|
||||
NS_IMETHOD GetControllerForCommand(const nsAReadableString& aCommand, nsIController** aResult)=0;
|
||||
NS_IMETHOD GetControllerForCommand(const nsAString& aCommand, nsIController** aResult)=0;
|
||||
NS_IMETHOD GetControllers(nsIControllers** aResult)=0;
|
||||
|
||||
NS_IMETHOD MoveFocus(PRBool aForward, nsIDOMElement* aElt)=0;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
#define nsIDOMEventCapturer_h__
|
||||
|
||||
#include "nsISupports.h"
|
||||
#include "nsAWritableString.h"
|
||||
#include "nsAString.h"
|
||||
#include "nsIScriptContext.h"
|
||||
#include "nsIDOMEventReceiver.h"
|
||||
|
||||
|
|
@ -54,21 +54,21 @@ class nsIDOMEventCapturer : public nsIDOMEventReceiver {
|
|||
public:
|
||||
static const nsIID& GetIID() { static nsIID iid = NS_IDOMEVENTCAPTURER_IID; return iid; }
|
||||
|
||||
NS_IMETHOD CaptureEvent(const nsAReadableString& aType)=0;
|
||||
NS_IMETHOD CaptureEvent(const nsAString& aType)=0;
|
||||
|
||||
NS_IMETHOD ReleaseEvent(const nsAReadableString& aType)=0;
|
||||
NS_IMETHOD ReleaseEvent(const nsAString& aType)=0;
|
||||
};
|
||||
|
||||
|
||||
#define NS_DECL_IDOMEVENTCAPTURER \
|
||||
NS_IMETHOD CaptureEvent(const nsAReadableString& aType); \
|
||||
NS_IMETHOD ReleaseEvent(const nsAReadableString& aType); \
|
||||
NS_IMETHOD CaptureEvent(const nsAString& aType); \
|
||||
NS_IMETHOD ReleaseEvent(const nsAString& aType); \
|
||||
|
||||
|
||||
|
||||
#define NS_FORWARD_IDOMEVENTCAPTURER(_to) \
|
||||
NS_IMETHOD CaptureEvent(const nsAReadableString& aType) { return _to CaptureEvent(aType); } \
|
||||
NS_IMETHOD ReleaseEvent(const nsAReadableString& aType) { return _to ReleaseEvent(aType); } \
|
||||
NS_IMETHOD CaptureEvent(const nsAString& aType) { return _to CaptureEvent(aType); } \
|
||||
NS_IMETHOD ReleaseEvent(const nsAString& aType) { return _to ReleaseEvent(aType); } \
|
||||
|
||||
|
||||
#endif // nsIDOMEventCapturer_h__
|
||||
|
|
|
|||
|
|
@ -41,14 +41,14 @@
|
|||
#include "nsISupports.idl"
|
||||
|
||||
%{ C++
|
||||
#include "nsAWritableString.h"
|
||||
#include "nsAString.h"
|
||||
|
||||
inline PRBool DOMStringIsNull(const nsAReadableString& aString)
|
||||
inline PRBool DOMStringIsNull(const nsAString& aString)
|
||||
{
|
||||
return aString.IsVoid();
|
||||
}
|
||||
|
||||
inline void SetDOMStringToNull(nsAWritableString& aString)
|
||||
inline void SetDOMStringToNull(nsAString& aString)
|
||||
{
|
||||
aString.Truncate();
|
||||
aString.SetIsVoid(PR_TRUE);
|
||||
|
|
|
|||
|
|
@ -84,16 +84,16 @@ public:
|
|||
* @return NS_OK if the script was valid and got executed
|
||||
*
|
||||
**/
|
||||
NS_IMETHOD EvaluateString(const nsAReadableString& aScript,
|
||||
NS_IMETHOD EvaluateString(const nsAString& aScript,
|
||||
void *aScopeObject,
|
||||
nsIPrincipal *aPrincipal,
|
||||
const char *aURL,
|
||||
PRUint32 aLineNo,
|
||||
const char* aVersion,
|
||||
nsAWritableString& aRetValue,
|
||||
nsAString& aRetValue,
|
||||
PRBool* aIsUndefined) = 0;
|
||||
|
||||
NS_IMETHOD EvaluateStringWithValue(const nsAReadableString& aScript,
|
||||
NS_IMETHOD EvaluateStringWithValue(const nsAString& aScript,
|
||||
void *aScopeObject,
|
||||
nsIPrincipal *aPrincipal,
|
||||
const char *aURL,
|
||||
|
|
@ -145,7 +145,7 @@ public:
|
|||
*/
|
||||
NS_IMETHOD ExecuteScript(void* aScriptObject,
|
||||
void* aScopeObject,
|
||||
nsAWritableString* aRetValue,
|
||||
nsAString* aRetValue,
|
||||
PRBool* aIsUndefined) = 0;
|
||||
|
||||
/**
|
||||
|
|
@ -172,7 +172,7 @@ public:
|
|||
*/
|
||||
NS_IMETHOD CompileEventHandler(void* aTarget,
|
||||
nsIAtom* aName,
|
||||
const nsAReadableString& aBody,
|
||||
const nsAString& aBody,
|
||||
PRBool aShared,
|
||||
void** aHandler) = 0;
|
||||
|
||||
|
|
@ -216,7 +216,7 @@ public:
|
|||
const nsCString& aName,
|
||||
PRUint32 aArgCount,
|
||||
const char** aArgArray,
|
||||
const nsAReadableString& aBody,
|
||||
const nsAString& aBody,
|
||||
const char* aURL,
|
||||
PRUint32 aLineNo,
|
||||
PRBool aShared,
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
#include "nsISupports.h"
|
||||
#include "nsIScriptContext.h"
|
||||
#include "nsAReadableString.h"
|
||||
#include "nsAString.h"
|
||||
|
||||
#define NS_ISCRIPTOBJECTOWNER_IID \
|
||||
{ /* 8f6bca7e-ce42-11d1-b724-00600891d8c9 */ \
|
||||
|
|
@ -117,7 +117,7 @@ public:
|
|||
NS_IMETHOD CompileEventHandler(nsIScriptContext* aContext,
|
||||
void* aTarget,
|
||||
nsIAtom *aName,
|
||||
const nsAReadableString& aBody,
|
||||
const nsAString& aBody,
|
||||
void** aHandler) = 0;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -4220,7 +4220,7 @@ nsNamedNodeMapSH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
|
|||
}
|
||||
|
||||
nsresult
|
||||
nsNamedNodeMapSH::GetNamedItem(nsISupports *aNative, nsAReadableString& aName,
|
||||
nsNamedNodeMapSH::GetNamedItem(nsISupports *aNative, const nsAString& aName,
|
||||
nsISupports **aResult)
|
||||
{
|
||||
nsCOMPtr<nsIDOMNamedNodeMap> map(do_QueryInterface(aNative));
|
||||
|
|
@ -4254,7 +4254,7 @@ nsHTMLCollectionSH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
|
|||
|
||||
nsresult
|
||||
nsHTMLCollectionSH::GetNamedItem(nsISupports *aNative,
|
||||
nsAReadableString& aName,
|
||||
const nsAString& aName,
|
||||
nsISupports **aResult)
|
||||
{
|
||||
nsCOMPtr<nsIDOMHTMLCollection> collection(do_QueryInterface(aNative));
|
||||
|
|
@ -4273,7 +4273,7 @@ nsHTMLCollectionSH::GetNamedItem(nsISupports *aNative,
|
|||
|
||||
nsresult
|
||||
nsFormControlListSH::GetNamedItem(nsISupports *aNative,
|
||||
nsAReadableString& aName,
|
||||
const nsAString& aName,
|
||||
nsISupports **aResult)
|
||||
{
|
||||
nsCOMPtr<nsIDOMNSHTMLFormControlList> list(do_QueryInterface(aNative));
|
||||
|
|
@ -5271,7 +5271,7 @@ nsPluginSH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
|
|||
}
|
||||
|
||||
nsresult
|
||||
nsPluginSH::GetNamedItem(nsISupports *aNative, nsAReadableString& aName,
|
||||
nsPluginSH::GetNamedItem(nsISupports *aNative, const nsAString& aName,
|
||||
nsISupports **aResult)
|
||||
{
|
||||
nsCOMPtr<nsIDOMPlugin> plugin(do_QueryInterface(aNative));
|
||||
|
|
@ -5305,7 +5305,7 @@ nsPluginArraySH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
|
|||
}
|
||||
|
||||
nsresult
|
||||
nsPluginArraySH::GetNamedItem(nsISupports *aNative, nsAReadableString& aName,
|
||||
nsPluginArraySH::GetNamedItem(nsISupports *aNative, const nsAString& aName,
|
||||
nsISupports **aResult)
|
||||
{
|
||||
nsCOMPtr<nsIDOMPluginArray> array(do_QueryInterface(aNative));
|
||||
|
|
@ -5339,7 +5339,7 @@ nsMimeTypeArraySH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
|
|||
}
|
||||
|
||||
nsresult
|
||||
nsMimeTypeArraySH::GetNamedItem(nsISupports *aNative, nsAReadableString& aName,
|
||||
nsMimeTypeArraySH::GetNamedItem(nsISupports *aNative, const nsAString& aName,
|
||||
nsISupports **aResult)
|
||||
{
|
||||
nsCOMPtr<nsIDOMMimeTypeArray> array(do_QueryInterface(aNative));
|
||||
|
|
@ -5422,7 +5422,7 @@ nsHistorySH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
|
|||
|
||||
nsresult
|
||||
nsHistorySH::GetStringAt(nsISupports *aNative, PRInt32 aIndex,
|
||||
nsAWritableString& aResult)
|
||||
nsAString& aResult)
|
||||
{
|
||||
if (aIndex < 0) {
|
||||
return NS_ERROR_DOM_INDEX_SIZE_ERR;
|
||||
|
|
@ -5438,7 +5438,7 @@ nsHistorySH::GetStringAt(nsISupports *aNative, PRInt32 aIndex,
|
|||
|
||||
nsresult
|
||||
nsMediaListSH::GetStringAt(nsISupports *aNative, PRInt32 aIndex,
|
||||
nsAWritableString& aResult)
|
||||
nsAString& aResult)
|
||||
{
|
||||
if (aIndex < 0) {
|
||||
return NS_ERROR_DOM_INDEX_SIZE_ERR;
|
||||
|
|
@ -5472,7 +5472,7 @@ nsStyleSheetListSH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
|
|||
|
||||
nsresult
|
||||
nsCSSStyleDeclSH::GetStringAt(nsISupports *aNative, PRInt32 aIndex,
|
||||
nsAWritableString& aResult)
|
||||
nsAString& aResult)
|
||||
{
|
||||
if (aIndex < 0) {
|
||||
return NS_ERROR_DOM_INDEX_SIZE_ERR;
|
||||
|
|
|
|||
|
|
@ -418,7 +418,7 @@ protected:
|
|||
{
|
||||
}
|
||||
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, nsAReadableString& aName,
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, const nsAString& aName,
|
||||
nsISupports **aResult) = 0;
|
||||
|
||||
public:
|
||||
|
|
@ -446,7 +446,7 @@ protected:
|
|||
nsISupports **aResult);
|
||||
|
||||
// Override nsNamedArraySH::GetNamedItem()
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, nsAReadableString& aName,
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, const nsAString& aName,
|
||||
nsISupports **aResult);
|
||||
|
||||
public:
|
||||
|
|
@ -476,7 +476,7 @@ protected:
|
|||
nsISupports **aResult);
|
||||
|
||||
// Override nsNamedArraySH::GetNamedItem()
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, nsAReadableString& aName,
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, const nsAString& aName,
|
||||
nsISupports **aResult);
|
||||
|
||||
public:
|
||||
|
|
@ -502,7 +502,7 @@ protected:
|
|||
|
||||
// Override nsNamedArraySH::GetNamedItem() since our NamedItem() can
|
||||
// return either a nsIDOMNode or a nsIHTMLCollection
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, nsAReadableString& aName,
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, const nsAString& aName,
|
||||
nsISupports **aResult);
|
||||
|
||||
public:
|
||||
|
|
@ -796,7 +796,7 @@ protected:
|
|||
nsISupports **aResult);
|
||||
|
||||
// Override nsNamedArraySH::GetNamedItem()
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, nsAReadableString& aName,
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, const nsAString& aName,
|
||||
nsISupports **aResult);
|
||||
|
||||
public:
|
||||
|
|
@ -826,7 +826,7 @@ protected:
|
|||
nsISupports **aResult);
|
||||
|
||||
// Override nsNamedArraySH::GetNamedItem()
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, nsAReadableString& aName,
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, const nsAString& aName,
|
||||
nsISupports **aResult);
|
||||
|
||||
public:
|
||||
|
|
@ -856,7 +856,7 @@ protected:
|
|||
nsISupports **aResult);
|
||||
|
||||
// Override nsNamedArraySH::GetNamedItem()
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, nsAReadableString& aName,
|
||||
virtual nsresult GetNamedItem(nsISupports *aNative, const nsAString& aName,
|
||||
nsISupports **aResult);
|
||||
|
||||
public:
|
||||
|
|
@ -881,7 +881,7 @@ protected:
|
|||
}
|
||||
|
||||
virtual nsresult GetStringAt(nsISupports *aNative, PRInt32 aIndex,
|
||||
nsAWritableString& aResult) = 0;
|
||||
nsAString& aResult) = 0;
|
||||
|
||||
public:
|
||||
NS_IMETHOD GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
|
||||
|
|
@ -903,7 +903,7 @@ protected:
|
|||
}
|
||||
|
||||
virtual nsresult GetStringAt(nsISupports *aNative, PRInt32 aIndex,
|
||||
nsAWritableString& aResult);
|
||||
nsAString& aResult);
|
||||
|
||||
public:
|
||||
NS_IMETHOD GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
|
||||
|
|
@ -930,7 +930,7 @@ protected:
|
|||
}
|
||||
|
||||
virtual nsresult GetStringAt(nsISupports *aNative, PRInt32 aIndex,
|
||||
nsAWritableString& aResult);
|
||||
nsAString& aResult);
|
||||
|
||||
public:
|
||||
static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
|
||||
|
|
@ -980,7 +980,7 @@ protected:
|
|||
}
|
||||
|
||||
virtual nsresult GetStringAt(nsISupports *aNative, PRInt32 aIndex,
|
||||
nsAWritableString& aResult);
|
||||
nsAString& aResult);
|
||||
|
||||
public:
|
||||
static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ nsDOMWindowList::Item(PRUint32 aIndex, nsIDOMWindow** aReturn)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMWindowList::NamedItem(const nsAReadableString& aName, nsIDOMWindow** aReturn)
|
||||
nsDOMWindowList::NamedItem(const nsAString& aName, nsIDOMWindow** aReturn)
|
||||
{
|
||||
nsCOMPtr<nsIDocShellTreeItem> item;
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ public:
|
|||
//nsIDOMWindowCollection interface
|
||||
NS_IMETHOD GetLength(PRUint32* aLength);
|
||||
NS_IMETHOD Item(PRUint32 aIndex, nsIDOMWindow** aReturn);
|
||||
NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMWindow** aReturn);
|
||||
NS_IMETHOD NamedItem(const nsAString& aName, nsIDOMWindow** aReturn);
|
||||
|
||||
//local methods
|
||||
NS_IMETHOD SetDocShell(nsIDocShell* aDocShell);
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ nsFocusController::SetFocusedWindow(nsIDOMWindowInternal* aWindow)
|
|||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsFocusController::UpdateCommands(const nsAReadableString& aEventName)
|
||||
nsFocusController::UpdateCommands(const nsAString& aEventName)
|
||||
{
|
||||
if (mCurrentWindow) {
|
||||
mCurrentWindow->UpdateCommands(aEventName);
|
||||
|
|
@ -344,7 +344,7 @@ nsFocusController::GetParentWindowFromDocument(nsIDOMDocument* aDocument, nsIDOM
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsFocusController::GetControllerForCommand(const nsAReadableString& aCommand, nsIController** _retval)
|
||||
nsFocusController::GetControllerForCommand(const nsAString& aCommand, nsIController** _retval)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(_retval);
|
||||
*_retval = nsnull;
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ public:
|
|||
NS_IMETHOD GetPopupNode(nsIDOMNode** aNode);
|
||||
NS_IMETHOD SetPopupNode(nsIDOMNode* aNode);
|
||||
|
||||
NS_IMETHOD GetControllerForCommand(const nsAReadableString& aCommand, nsIController** aResult);
|
||||
NS_IMETHOD GetControllerForCommand(const nsAString& aCommand, nsIController** aResult);
|
||||
NS_IMETHOD GetControllers(nsIControllers** aResult);
|
||||
|
||||
NS_IMETHOD MoveFocus(PRBool aForward, nsIDOMElement* aElt);
|
||||
|
|
@ -81,7 +81,7 @@ public:
|
|||
NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent) { return NS_OK; };
|
||||
|
||||
protected:
|
||||
NS_IMETHOD UpdateCommands(const nsAReadableString& aEventName);
|
||||
NS_IMETHOD UpdateCommands(const nsAString& aEventName);
|
||||
|
||||
public:
|
||||
static nsresult GetParentWindowFromDocument(nsIDOMDocument* aElement, nsIDOMWindowInternal** aWindow);
|
||||
|
|
|
|||
|
|
@ -1252,14 +1252,14 @@ GlobalWindowImpl::SetOpener(nsIDOMWindowInternal* aOpener)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::GetStatus(nsAWritableString& aStatus)
|
||||
GlobalWindowImpl::GetStatus(nsAString& aStatus)
|
||||
{
|
||||
aStatus = mStatus;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::SetStatus(const nsAReadableString& aStatus)
|
||||
GlobalWindowImpl::SetStatus(const nsAString& aStatus)
|
||||
{
|
||||
mStatus = aStatus;
|
||||
|
||||
|
|
@ -1274,14 +1274,14 @@ GlobalWindowImpl::SetStatus(const nsAReadableString& aStatus)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::GetDefaultStatus(nsAWritableString& aDefaultStatus)
|
||||
GlobalWindowImpl::GetDefaultStatus(nsAString& aDefaultStatus)
|
||||
{
|
||||
aDefaultStatus = mDefaultStatus;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::SetDefaultStatus(const nsAReadableString& aDefaultStatus)
|
||||
GlobalWindowImpl::SetDefaultStatus(const nsAString& aDefaultStatus)
|
||||
{
|
||||
mDefaultStatus = aDefaultStatus;
|
||||
|
||||
|
|
@ -1295,7 +1295,7 @@ GlobalWindowImpl::SetDefaultStatus(const nsAReadableString& aDefaultStatus)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::GetName(nsAWritableString& aName)
|
||||
GlobalWindowImpl::GetName(nsAString& aName)
|
||||
{
|
||||
nsXPIDLString name;
|
||||
nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(mDocShell));
|
||||
|
|
@ -1307,7 +1307,7 @@ GlobalWindowImpl::GetName(nsAWritableString& aName)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::SetName(const nsAReadableString& aName)
|
||||
GlobalWindowImpl::SetName(const nsAString& aName)
|
||||
{
|
||||
nsresult result = NS_OK;
|
||||
nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(mDocShell));
|
||||
|
|
@ -1820,7 +1820,7 @@ NS_IMETHODIMP GlobalWindowImpl::GetFullScreen(PRBool* aFullScreen)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::Dump(const nsAReadableString& aStr)
|
||||
GlobalWindowImpl::Dump(const nsAString& aStr)
|
||||
{
|
||||
#if !(defined(NS_DEBUG) || defined(MOZ_ENABLE_JS_DUMP))
|
||||
{
|
||||
|
|
@ -1976,7 +1976,7 @@ GlobalWindowImpl::MakeScriptDialogTitle(nsAReadableString &aInTitle, nsAWritable
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::Alert(const nsAReadableString& aString)
|
||||
GlobalWindowImpl::Alert(const nsAString& aString)
|
||||
{
|
||||
NS_ENSURE_STATE(mDocShell);
|
||||
|
||||
|
|
@ -2008,7 +2008,7 @@ GlobalWindowImpl::Alert(const nsAReadableString& aString)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::Confirm(const nsAReadableString& aString, PRBool* aReturn)
|
||||
GlobalWindowImpl::Confirm(const nsAString& aString, PRBool* aReturn)
|
||||
{
|
||||
NS_ENSURE_STATE(mDocShell);
|
||||
|
||||
|
|
@ -2042,11 +2042,11 @@ GlobalWindowImpl::Confirm(const nsAReadableString& aString, PRBool* aReturn)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::Prompt(const nsAReadableString& aMessage,
|
||||
const nsAReadableString& aInitial,
|
||||
const nsAReadableString& aTitle,
|
||||
GlobalWindowImpl::Prompt(const nsAString& aMessage,
|
||||
const nsAString& aInitial,
|
||||
const nsAString& aTitle,
|
||||
PRUint32 aSavePassword,
|
||||
nsAWritableString& aReturn)
|
||||
nsAString& aReturn)
|
||||
{
|
||||
NS_ENSURE_STATE(mDocShell);
|
||||
|
||||
|
|
@ -2115,7 +2115,7 @@ GlobalWindowImpl::Prompt(const nsAReadableString& aMessage,
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::Prompt(nsAWritableString& aReturn)
|
||||
GlobalWindowImpl::Prompt(nsAString& aReturn)
|
||||
{
|
||||
NS_ENSURE_STATE(mDocShell);
|
||||
NS_ENSURE_STATE(sXPConnect);
|
||||
|
|
@ -2624,9 +2624,9 @@ GlobalWindowImpl::CheckForAbusePoint ()
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::Open(const nsAReadableString& aUrl,
|
||||
const nsAReadableString& aName,
|
||||
const nsAReadableString& aOptions,
|
||||
GlobalWindowImpl::Open(const nsAString& aUrl,
|
||||
const nsAString& aName,
|
||||
const nsAString& aOptions,
|
||||
nsIDOMWindow **_retval)
|
||||
{
|
||||
return OpenInternal(aUrl, aName, aOptions, PR_FALSE, nsnull, 0, nsnull,
|
||||
|
|
@ -2690,9 +2690,9 @@ GlobalWindowImpl::Open(nsIDOMWindow **_retval)
|
|||
// like Open, but attaches to the new window any extra parameters past
|
||||
// [features] as a JS property named "arguments"
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::OpenDialog(const nsAReadableString& aUrl,
|
||||
const nsAReadableString& aName,
|
||||
const nsAReadableString& aOptions,
|
||||
GlobalWindowImpl::OpenDialog(const nsAString& aUrl,
|
||||
const nsAString& aName,
|
||||
const nsAString& aOptions,
|
||||
nsISupports* aExtraArgument,
|
||||
nsIDOMWindow** _retval)
|
||||
{
|
||||
|
|
@ -2814,7 +2814,7 @@ GlobalWindowImpl::ReallyCloseWindow()
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::UpdateCommands(const nsAReadableString& anAction)
|
||||
GlobalWindowImpl::UpdateCommands(const nsAString& anAction)
|
||||
{
|
||||
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
|
||||
GetPrivateRoot(getter_AddRefs(rootWindow));
|
||||
|
|
@ -2839,8 +2839,8 @@ GlobalWindowImpl::UpdateCommands(const nsAReadableString& anAction)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::Escape(const nsAReadableString& aStr,
|
||||
nsAWritableString& aReturn)
|
||||
GlobalWindowImpl::Escape(const nsAString& aStr,
|
||||
nsAString& aReturn)
|
||||
{
|
||||
nsresult result = NS_OK;
|
||||
nsCOMPtr<nsIUnicodeEncoder> encoder;
|
||||
|
|
@ -2911,8 +2911,8 @@ GlobalWindowImpl::Escape(const nsAReadableString& aStr,
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::Unescape(const nsAReadableString& aStr,
|
||||
nsAWritableString& aReturn)
|
||||
GlobalWindowImpl::Unescape(const nsAString& aStr,
|
||||
nsAString& aReturn)
|
||||
{
|
||||
nsresult result = NS_OK;
|
||||
nsCOMPtr<nsIUnicodeDecoder> decoder;
|
||||
|
|
@ -3011,7 +3011,7 @@ GlobalWindowImpl::GetSelection(nsISelection** aSelection)
|
|||
|
||||
// Non-scriptable version of window.find(), part of nsIDOMWindowInternal
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::Find(const nsAReadableString& aStr,
|
||||
GlobalWindowImpl::Find(const nsAString& aStr,
|
||||
PRBool aCaseSensitive,
|
||||
PRBool aBackwards,
|
||||
PRBool aWrapAround,
|
||||
|
|
@ -3105,7 +3105,7 @@ GlobalWindowImpl::Find(PRBool *aDidFind)
|
|||
}
|
||||
|
||||
nsresult
|
||||
GlobalWindowImpl::FindInternal(nsAReadableString& aStr,
|
||||
GlobalWindowImpl::FindInternal(const nsAString& aStr,
|
||||
PRBool caseSensitive,
|
||||
PRBool backwards,
|
||||
PRBool wrapAround,
|
||||
|
|
@ -3271,7 +3271,7 @@ GlobalWindowImpl::Btoa(const nsAString& aBinaryData,
|
|||
//*****************************************************************************
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::AddEventListener(const nsAReadableString& aType,
|
||||
GlobalWindowImpl::AddEventListener(const nsAString& aType,
|
||||
nsIDOMEventListener* aListener,
|
||||
PRBool aUseCapture)
|
||||
{
|
||||
|
|
@ -3287,7 +3287,7 @@ GlobalWindowImpl::AddEventListener(const nsAReadableString& aType,
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::RemoveEventListener(const nsAReadableString& aType,
|
||||
GlobalWindowImpl::RemoveEventListener(const nsAString& aType,
|
||||
nsIDOMEventListener* aListener,
|
||||
PRBool aUseCapture)
|
||||
{
|
||||
|
|
@ -3676,7 +3676,7 @@ GlobalWindowImpl::SetMutationListeners(PRUint32 aType)
|
|||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::GetComputedStyle(nsIDOMElement* aElt,
|
||||
const nsAReadableString& aPseudoElt,
|
||||
const nsAString& aPseudoElt,
|
||||
nsIDOMCSSStyleDeclaration** aReturn)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aReturn);
|
||||
|
|
@ -3785,9 +3785,9 @@ GlobalWindowImpl::GetParentInternal(nsIDOMWindowInternal **aParent)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
GlobalWindowImpl::OpenInternal(const nsAReadableString& aUrl,
|
||||
const nsAReadableString& aName,
|
||||
const nsAReadableString& aOptions,
|
||||
GlobalWindowImpl::OpenInternal(const nsAString& aUrl,
|
||||
const nsAString& aName,
|
||||
const nsAString& aOptions,
|
||||
PRBool aDialog, jsval *argv, PRUint32 argc,
|
||||
nsISupports *aExtraArgument,
|
||||
nsIDOMWindow **aReturn)
|
||||
|
|
@ -4693,14 +4693,14 @@ NS_IMPL_RELEASE_INHERITED(nsGlobalChromeWindow, GlobalWindowImpl)
|
|||
// nsGlobalChromeWindow implementation
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsGlobalChromeWindow::GetTitle(nsAWritableString& aTitle)
|
||||
nsGlobalChromeWindow::GetTitle(nsAString& aTitle)
|
||||
{
|
||||
aTitle = mTitle;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsGlobalChromeWindow::SetTitle(const nsAReadableString& aTitle)
|
||||
nsGlobalChromeWindow::SetTitle(const nsAString& aTitle)
|
||||
{
|
||||
mTitle = aTitle;
|
||||
if(mDocShell) {
|
||||
|
|
@ -4807,7 +4807,7 @@ nsGlobalChromeWindow::GetAttention()
|
|||
//Note: This call will lock the cursor, it will not change as it moves.
|
||||
//To unlock, the cursor must be set back to CURSOR_AUTO.
|
||||
NS_IMETHODIMP
|
||||
nsGlobalChromeWindow::SetCursor(const nsAReadableString& aCursor)
|
||||
nsGlobalChromeWindow::SetCursor(const nsAString& aCursor)
|
||||
{
|
||||
nsresult rv = NS_OK;
|
||||
PRInt32 cursor;
|
||||
|
|
@ -4983,7 +4983,7 @@ void NavigatorImpl::SetDocShell(nsIDocShell *aDocShell)
|
|||
//*****************************************************************************
|
||||
|
||||
NS_IMETHODIMP
|
||||
NavigatorImpl::GetUserAgent(nsAWritableString& aUserAgent)
|
||||
NavigatorImpl::GetUserAgent(nsAString& aUserAgent)
|
||||
{
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIHttpProtocolHandler>
|
||||
|
|
@ -4998,7 +4998,7 @@ NavigatorImpl::GetUserAgent(nsAWritableString& aUserAgent)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
NavigatorImpl::GetAppCodeName(nsAWritableString& aAppCodeName)
|
||||
NavigatorImpl::GetAppCodeName(nsAString& aAppCodeName)
|
||||
{
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIHttpProtocolHandler>
|
||||
|
|
@ -5013,7 +5013,7 @@ NavigatorImpl::GetAppCodeName(nsAWritableString& aAppCodeName)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
NavigatorImpl::GetAppVersion(nsAWritableString& aAppVersion)
|
||||
NavigatorImpl::GetAppVersion(nsAString& aAppVersion)
|
||||
{
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIHttpProtocolHandler>
|
||||
|
|
@ -5044,14 +5044,14 @@ NavigatorImpl::GetAppVersion(nsAWritableString& aAppVersion)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
NavigatorImpl::GetAppName(nsAWritableString& aAppName)
|
||||
NavigatorImpl::GetAppName(nsAString& aAppName)
|
||||
{
|
||||
aAppName.Assign(NS_LITERAL_STRING("Netscape"));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
NavigatorImpl::GetLanguage(nsAWritableString& aLanguage)
|
||||
NavigatorImpl::GetLanguage(nsAString& aLanguage)
|
||||
{
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIHttpProtocolHandler>
|
||||
|
|
@ -5066,7 +5066,7 @@ NavigatorImpl::GetLanguage(nsAWritableString& aLanguage)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
NavigatorImpl::GetPlatform(nsAWritableString& aPlatform)
|
||||
NavigatorImpl::GetPlatform(nsAString& aPlatform)
|
||||
{
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIHttpProtocolHandler>
|
||||
|
|
@ -5095,7 +5095,7 @@ NavigatorImpl::GetPlatform(nsAWritableString& aPlatform)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
NavigatorImpl::GetOscpu(nsAWritableString& aOSCPU)
|
||||
NavigatorImpl::GetOscpu(nsAString& aOSCPU)
|
||||
{
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIHttpProtocolHandler>
|
||||
|
|
@ -5110,7 +5110,7 @@ NavigatorImpl::GetOscpu(nsAWritableString& aOSCPU)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
NavigatorImpl::GetVendor(nsAWritableString& aVendor)
|
||||
NavigatorImpl::GetVendor(nsAString& aVendor)
|
||||
{
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIHttpProtocolHandler>
|
||||
|
|
@ -5126,7 +5126,7 @@ NavigatorImpl::GetVendor(nsAWritableString& aVendor)
|
|||
|
||||
|
||||
NS_IMETHODIMP
|
||||
NavigatorImpl::GetVendorSub(nsAWritableString& aVendorSub)
|
||||
NavigatorImpl::GetVendorSub(nsAString& aVendorSub)
|
||||
{
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIHttpProtocolHandler>
|
||||
|
|
@ -5141,7 +5141,7 @@ NavigatorImpl::GetVendorSub(nsAWritableString& aVendorSub)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
NavigatorImpl::GetProduct(nsAWritableString& aProduct)
|
||||
NavigatorImpl::GetProduct(nsAString& aProduct)
|
||||
{
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIHttpProtocolHandler>
|
||||
|
|
@ -5156,7 +5156,7 @@ NavigatorImpl::GetProduct(nsAWritableString& aProduct)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
NavigatorImpl::GetProductSub(nsAWritableString& aProductSub)
|
||||
NavigatorImpl::GetProductSub(nsAString& aProductSub)
|
||||
{
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIHttpProtocolHandler>
|
||||
|
|
@ -5171,7 +5171,7 @@ NavigatorImpl::GetProductSub(nsAWritableString& aProductSub)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
NavigatorImpl::GetSecurityPolicy(nsAWritableString& aSecurityPolicy)
|
||||
NavigatorImpl::GetSecurityPolicy(nsAString& aSecurityPolicy)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -5590,7 +5590,7 @@ nsDOMWindowController::GetSelectionController(nsISelectionController **aSelCon)
|
|||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMWindowController::IsCommandEnabled(const nsAReadableString& aCommand,
|
||||
nsDOMWindowController::IsCommandEnabled(const nsAString& aCommand,
|
||||
PRBool *aResult)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aResult);
|
||||
|
|
@ -5637,7 +5637,7 @@ nsDOMWindowController::IsCommandEnabled(const nsAReadableString& aCommand,
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMWindowController::SupportsCommand(const nsAReadableString& aCommand,
|
||||
nsDOMWindowController::SupportsCommand(const nsAString& aCommand,
|
||||
PRBool *outSupported)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(outSupported);
|
||||
|
|
@ -5687,7 +5687,7 @@ nsDOMWindowController::SupportsCommand(const nsAReadableString& aCommand,
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMWindowController::DoCommand(const nsAReadableString & aCommand)
|
||||
nsDOMWindowController::DoCommand(const nsAString & aCommand)
|
||||
{
|
||||
nsresult rv = NS_ERROR_FAILURE;
|
||||
nsCAutoString commandName;
|
||||
|
|
@ -5839,7 +5839,7 @@ nsDOMWindowController::DoCommandWithSelectionController(const nsCString& aComman
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMWindowController::OnEvent(const nsAReadableString & aEventName)
|
||||
nsDOMWindowController::OnEvent(const nsAString & aEventName)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -155,10 +155,10 @@ public:
|
|||
NS_DECL_NSIDOMJSWINDOW
|
||||
|
||||
// nsIDOMEventTarget
|
||||
NS_IMETHOD AddEventListener(const nsAReadableString& aType,
|
||||
NS_IMETHOD AddEventListener(const nsAString& aType,
|
||||
nsIDOMEventListener* aListener,
|
||||
PRBool aUseCapture);
|
||||
NS_IMETHOD RemoveEventListener(const nsAReadableString& aType,
|
||||
NS_IMETHOD RemoveEventListener(const nsAString& aType,
|
||||
nsIDOMEventListener* aListener,
|
||||
PRBool aUseCapture);
|
||||
NS_IMETHOD DispatchEvent(nsIDOMEvent* aEvent, PRBool *_retval);
|
||||
|
|
@ -211,9 +211,9 @@ protected:
|
|||
void GetParentInternal(nsIDOMWindowInternal **parent);
|
||||
|
||||
// Window Control Functions
|
||||
NS_IMETHOD OpenInternal(const nsAReadableString& aUrl,
|
||||
const nsAReadableString& aName,
|
||||
const nsAReadableString& aOptions,
|
||||
NS_IMETHOD OpenInternal(const nsAString& aUrl,
|
||||
const nsAString& aName,
|
||||
const nsAString& aOptions,
|
||||
PRBool aDialog, jsval *argv, PRUint32 argc,
|
||||
nsISupports *aExtraArgument, nsIDOMWindow **aReturn);
|
||||
static void CloseWindow(nsISupports* aWindow);
|
||||
|
|
@ -246,7 +246,7 @@ protected:
|
|||
void MakeScriptDialogTitle(nsAReadableString &aInTitle, nsAWritableString &aOutTitle);
|
||||
|
||||
// Helper for window.find()
|
||||
nsresult FindInternal(nsAReadableString& aStr, PRBool caseSensitive,
|
||||
nsresult FindInternal(const nsAString& aStr, PRBool caseSensitive,
|
||||
PRBool backwards, PRBool wrapAround, PRBool wholeWord,
|
||||
PRBool searchInFrames, PRBool showDialog,
|
||||
PRBool *aReturn);
|
||||
|
|
@ -414,9 +414,9 @@ protected:
|
|||
nsresult GetURI(nsIURI** aURL);
|
||||
nsresult GetWritableURI(nsIURI** aURL);
|
||||
nsresult SetURI(nsIURI* aURL);
|
||||
nsresult SetHrefWithBase(const nsAReadableString& aHref, nsIURI* aBase,
|
||||
nsresult SetHrefWithBase(const nsAString& aHref, nsIURI* aBase,
|
||||
PRBool aReplace);
|
||||
nsresult SetHrefWithContext(JSContext* cx, const nsAReadableString& aHref,
|
||||
nsresult SetHrefWithContext(JSContext* cx, const nsAString& aHref,
|
||||
PRBool aReplace);
|
||||
|
||||
nsresult GetSourceURL(JSContext* cx, nsIURI** sourceURL);
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ HistoryImpl::GetLength(PRInt32* aLength)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
HistoryImpl::GetCurrent(nsAWritableString& aCurrent)
|
||||
HistoryImpl::GetCurrent(nsAString& aCurrent)
|
||||
{
|
||||
PRInt32 curIndex=0;
|
||||
nsCAutoString curURL;
|
||||
|
|
@ -126,7 +126,7 @@ HistoryImpl::GetCurrent(nsAWritableString& aCurrent)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
HistoryImpl::GetPrevious(nsAWritableString& aPrevious)
|
||||
HistoryImpl::GetPrevious(nsAString& aPrevious)
|
||||
{
|
||||
PRInt32 curIndex;
|
||||
nsCAutoString prevURL;
|
||||
|
|
@ -155,7 +155,7 @@ HistoryImpl::GetPrevious(nsAWritableString& aPrevious)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
HistoryImpl::GetNext(nsAWritableString& aNext)
|
||||
HistoryImpl::GetNext(nsAString& aNext)
|
||||
{
|
||||
PRInt32 curIndex;
|
||||
nsCAutoString nextURL;
|
||||
|
|
@ -242,7 +242,7 @@ HistoryImpl::GoIndex(PRInt32 aDelta)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
HistoryImpl::GoUri(const nsAReadableString& aUriSubstring)
|
||||
HistoryImpl::GoUri(const nsAString& aUriSubstring)
|
||||
{
|
||||
nsCOMPtr<nsISHistory> session_history;
|
||||
|
||||
|
|
@ -339,7 +339,7 @@ HistoryImpl::Go()
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
HistoryImpl::Item(PRUint32 aIndex, nsAWritableString& aReturn)
|
||||
HistoryImpl::Item(PRUint32 aIndex, nsAString& aReturn)
|
||||
{
|
||||
aReturn.Truncate();
|
||||
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@ NS_IMPL_RELEASE(nsJSContext)
|
|||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsJSContext::EvaluateStringWithValue(const nsAReadableString& aScript,
|
||||
nsJSContext::EvaluateStringWithValue(const nsAString& aScript,
|
||||
void *aScopeObject,
|
||||
nsIPrincipal *aPrincipal,
|
||||
const char *aURL,
|
||||
|
|
@ -582,13 +582,13 @@ nsJSContext::EvaluateStringWithValue(const nsAReadableString& aScript,
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsJSContext::EvaluateString(const nsAReadableString& aScript,
|
||||
nsJSContext::EvaluateString(const nsAString& aScript,
|
||||
void *aScopeObject,
|
||||
nsIPrincipal *aPrincipal,
|
||||
const char *aURL,
|
||||
PRUint32 aLineNo,
|
||||
const char* aVersion,
|
||||
nsAWritableString& aRetValue,
|
||||
nsAString& aRetValue,
|
||||
PRBool* aIsUndefined)
|
||||
{
|
||||
if (!mScriptsEnabled) {
|
||||
|
|
@ -782,7 +782,7 @@ nsJSContext::CompileScript(const PRUnichar* aText,
|
|||
NS_IMETHODIMP
|
||||
nsJSContext::ExecuteScript(void* aScriptObject,
|
||||
void *aScopeObject,
|
||||
nsAWritableString* aRetValue,
|
||||
nsAString* aRetValue,
|
||||
PRBool* aIsUndefined)
|
||||
{
|
||||
if (!mScriptsEnabled) {
|
||||
|
|
@ -878,7 +878,7 @@ AtomToEventHandlerName(nsIAtom *aName, char *charName, PRUint32 charNameSize)
|
|||
|
||||
NS_IMETHODIMP
|
||||
nsJSContext::CompileEventHandler(void *aTarget, nsIAtom *aName,
|
||||
const nsAReadableString& aBody,
|
||||
const nsAString& aBody,
|
||||
PRBool aShared, void** aHandler)
|
||||
{
|
||||
JSPrincipals *jsprin = nsnull;
|
||||
|
|
@ -929,7 +929,7 @@ nsJSContext::CompileFunction(void* aTarget,
|
|||
const nsCString& aName,
|
||||
PRUint32 aArgCount,
|
||||
const char** aArgArray,
|
||||
const nsAReadableString& aBody,
|
||||
const nsAString& aBody,
|
||||
const char* aURL,
|
||||
PRUint32 aLineNo,
|
||||
PRBool aShared,
|
||||
|
|
|
|||
|
|
@ -58,15 +58,15 @@ public:
|
|||
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
NS_IMETHOD EvaluateString(const nsAReadableString& aScript,
|
||||
NS_IMETHOD EvaluateString(const nsAString& aScript,
|
||||
void *aScopeObject,
|
||||
nsIPrincipal *principal,
|
||||
const char *aURL,
|
||||
PRUint32 aLineNo,
|
||||
const char* aVersion,
|
||||
nsAWritableString& aRetValue,
|
||||
nsAString& aRetValue,
|
||||
PRBool* aIsUndefined);
|
||||
NS_IMETHOD EvaluateStringWithValue(const nsAReadableString& aScript,
|
||||
NS_IMETHOD EvaluateStringWithValue(const nsAString& aScript,
|
||||
void *aScopeObject,
|
||||
nsIPrincipal *aPrincipal,
|
||||
const char *aURL,
|
||||
|
|
@ -85,11 +85,11 @@ public:
|
|||
void** aScriptObject);
|
||||
NS_IMETHOD ExecuteScript(void* aScriptObject,
|
||||
void *aScopeObject,
|
||||
nsAWritableString* aRetValue,
|
||||
nsAString* aRetValue,
|
||||
PRBool* aIsUndefined);
|
||||
NS_IMETHOD CompileEventHandler(void *aTarget,
|
||||
nsIAtom *aName,
|
||||
const nsAReadableString& aBody,
|
||||
const nsAString& aBody,
|
||||
PRBool aShared,
|
||||
void** aHandler);
|
||||
NS_IMETHOD CallEventHandler(void *aTarget, void *aHandler,
|
||||
|
|
@ -102,7 +102,7 @@ public:
|
|||
const nsCString& aName,
|
||||
PRUint32 aArgCount,
|
||||
const char** aArgArray,
|
||||
const nsAReadableString& aBody,
|
||||
const nsAString& aBody,
|
||||
const char* aURL,
|
||||
PRUint32 aLineNo,
|
||||
PRBool aShared,
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ nsJSUtils::ConvertJSValToXPCObject(nsISupports** aSupports, REFNSIID aIID,
|
|||
}
|
||||
|
||||
void
|
||||
nsJSUtils::ConvertJSValToString(nsAWritableString& aString,
|
||||
nsJSUtils::ConvertJSValToString(nsAString& aString,
|
||||
JSContext* aContext, jsval aValue)
|
||||
{
|
||||
JSString *jsstring;
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ public:
|
|||
static PRBool ConvertJSValToXPCObject(nsISupports** aSupports, REFNSIID aIID,
|
||||
JSContext* aContext, jsval aValue);
|
||||
|
||||
static void ConvertJSValToString(nsAWritableString& aString,
|
||||
static void ConvertJSValToString(nsAString& aString,
|
||||
JSContext* aContext, jsval aValue);
|
||||
|
||||
static PRBool ConvertJSValToUint32(PRUint32* aProp, JSContext* aContext,
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
#include "nsICharsetConverterManager2.h"
|
||||
|
||||
|
||||
static nsresult EscapeNonAsciiInURI(nsAReadableString& aHref, nsAWritableCString& aEscapedHref)
|
||||
static nsresult EscapeNonAsciiInURI(const nsAString& aHref, nsACString& aEscapedHref)
|
||||
{
|
||||
aEscapedHref.Truncate(0);
|
||||
|
||||
|
|
@ -280,7 +280,7 @@ LocationImpl::SetURI(nsIURI* aURI)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::GetHash(nsAWritableString& aHash)
|
||||
LocationImpl::GetHash(nsAString& aHash)
|
||||
{
|
||||
aHash.SetLength(0);
|
||||
|
||||
|
|
@ -307,7 +307,7 @@ LocationImpl::GetHash(nsAWritableString& aHash)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::SetHash(const nsAReadableString& aHash)
|
||||
LocationImpl::SetHash(const nsAString& aHash)
|
||||
{
|
||||
nsCOMPtr<nsIURI> uri;
|
||||
nsresult result = NS_OK;
|
||||
|
|
@ -335,7 +335,7 @@ LocationImpl::SetHash(const nsAReadableString& aHash)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::GetHost(nsAWritableString& aHost)
|
||||
LocationImpl::GetHost(nsAString& aHost)
|
||||
{
|
||||
aHost.SetLength(0);
|
||||
|
||||
|
|
@ -358,7 +358,7 @@ LocationImpl::GetHost(nsAWritableString& aHost)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::SetHost(const nsAReadableString& aHost)
|
||||
LocationImpl::SetHost(const nsAString& aHost)
|
||||
{
|
||||
nsCOMPtr<nsIURI> uri;
|
||||
nsresult result;
|
||||
|
|
@ -374,7 +374,7 @@ LocationImpl::SetHost(const nsAReadableString& aHost)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::GetHostname(nsAWritableString& aHostname)
|
||||
LocationImpl::GetHostname(nsAString& aHostname)
|
||||
{
|
||||
aHostname.SetLength(0);
|
||||
|
||||
|
|
@ -397,7 +397,7 @@ LocationImpl::GetHostname(nsAWritableString& aHostname)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::SetHostname(const nsAReadableString& aHostname)
|
||||
LocationImpl::SetHostname(const nsAString& aHostname)
|
||||
{
|
||||
nsCOMPtr<nsIURI> uri;
|
||||
nsresult result;
|
||||
|
|
@ -413,7 +413,7 @@ LocationImpl::SetHostname(const nsAReadableString& aHostname)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::GetHref(nsAWritableString& aHref)
|
||||
LocationImpl::GetHref(nsAString& aHref)
|
||||
{
|
||||
aHref.SetLength(0);
|
||||
|
||||
|
|
@ -436,7 +436,7 @@ LocationImpl::GetHref(nsAWritableString& aHref)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::SetHref(const nsAReadableString& aHref)
|
||||
LocationImpl::SetHref(const nsAString& aHref)
|
||||
{
|
||||
nsAutoString oldHref;
|
||||
nsresult rv = NS_OK;
|
||||
|
|
@ -473,7 +473,7 @@ LocationImpl::SetHref(const nsAReadableString& aHref)
|
|||
}
|
||||
|
||||
nsresult
|
||||
LocationImpl::SetHrefWithContext(JSContext* cx, const nsAReadableString& aHref,
|
||||
LocationImpl::SetHrefWithContext(JSContext* cx, const nsAString& aHref,
|
||||
PRBool aReplace)
|
||||
{
|
||||
nsCOMPtr<nsIURI> base;
|
||||
|
|
@ -489,7 +489,7 @@ LocationImpl::SetHrefWithContext(JSContext* cx, const nsAReadableString& aHref,
|
|||
}
|
||||
|
||||
nsresult
|
||||
LocationImpl::SetHrefWithBase(const nsAReadableString& aHref,
|
||||
LocationImpl::SetHrefWithBase(const nsAString& aHref,
|
||||
nsIURI* aBase, PRBool aReplace)
|
||||
{
|
||||
nsresult result;
|
||||
|
|
@ -557,7 +557,7 @@ LocationImpl::SetHrefWithBase(const nsAReadableString& aHref,
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::GetPathname(nsAWritableString& aPathname)
|
||||
LocationImpl::GetPathname(nsAString& aPathname)
|
||||
{
|
||||
aPathname.SetLength(0);
|
||||
|
||||
|
|
@ -581,7 +581,7 @@ LocationImpl::GetPathname(nsAWritableString& aPathname)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::SetPathname(const nsAReadableString& aPathname)
|
||||
LocationImpl::SetPathname(const nsAString& aPathname)
|
||||
{
|
||||
nsCOMPtr<nsIURI> uri;
|
||||
nsresult result = NS_OK;
|
||||
|
|
@ -597,7 +597,7 @@ LocationImpl::SetPathname(const nsAReadableString& aPathname)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::GetPort(nsAWritableString& aPort)
|
||||
LocationImpl::GetPort(nsAString& aPort)
|
||||
{
|
||||
aPort.SetLength(0);
|
||||
|
||||
|
|
@ -621,7 +621,7 @@ LocationImpl::GetPort(nsAWritableString& aPort)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::SetPort(const nsAReadableString& aPort)
|
||||
LocationImpl::SetPort(const nsAString& aPort)
|
||||
{
|
||||
nsCOMPtr<nsIURI> uri;
|
||||
nsresult result = NS_OK;
|
||||
|
|
@ -651,7 +651,7 @@ LocationImpl::SetPort(const nsAReadableString& aPort)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::GetProtocol(nsAWritableString& aProtocol)
|
||||
LocationImpl::GetProtocol(nsAString& aProtocol)
|
||||
{
|
||||
aProtocol.SetLength(0);
|
||||
|
||||
|
|
@ -675,7 +675,7 @@ LocationImpl::GetProtocol(nsAWritableString& aProtocol)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::SetProtocol(const nsAReadableString& aProtocol)
|
||||
LocationImpl::SetProtocol(const nsAString& aProtocol)
|
||||
{
|
||||
nsCOMPtr<nsIURI> uri;
|
||||
nsresult result = NS_OK;
|
||||
|
|
@ -691,7 +691,7 @@ LocationImpl::SetProtocol(const nsAReadableString& aProtocol)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::GetSearch(nsAWritableString& aSearch)
|
||||
LocationImpl::GetSearch(nsAString& aSearch)
|
||||
{
|
||||
aSearch.SetLength(0);
|
||||
|
||||
|
|
@ -716,7 +716,7 @@ LocationImpl::GetSearch(nsAWritableString& aSearch)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::SetSearch(const nsAReadableString& aSearch)
|
||||
LocationImpl::SetSearch(const nsAString& aSearch)
|
||||
{
|
||||
nsCOMPtr<nsIURI> uri;
|
||||
nsresult result = NS_OK;
|
||||
|
|
@ -793,7 +793,7 @@ LocationImpl::Reload()
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::Replace(const nsAReadableString& aUrl)
|
||||
LocationImpl::Replace(const nsAString& aUrl)
|
||||
{
|
||||
nsresult rv = NS_OK;
|
||||
|
||||
|
|
@ -825,7 +825,7 @@ LocationImpl::Replace(const nsAReadableString& aUrl)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::Assign(const nsAReadableString& aUrl)
|
||||
LocationImpl::Assign(const nsAString& aUrl)
|
||||
{
|
||||
nsAutoString oldHref;
|
||||
nsresult result = NS_OK;
|
||||
|
|
@ -846,7 +846,7 @@ LocationImpl::Assign(const nsAReadableString& aUrl)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LocationImpl::ToString(nsAWritableString& aReturn)
|
||||
LocationImpl::ToString(nsAString& aReturn)
|
||||
{
|
||||
return GetHref(aReturn);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ MimeTypeArrayImpl::Item(PRUint32 aIndex, nsIDOMMimeType** aReturn)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
MimeTypeArrayImpl::NamedItem(const nsAReadableString& aName,
|
||||
MimeTypeArrayImpl::NamedItem(const nsAString& aName,
|
||||
nsIDOMMimeType** aReturn)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aReturn);
|
||||
|
|
@ -225,7 +225,7 @@ NS_IMPL_RELEASE(MimeTypeElementImpl)
|
|||
|
||||
|
||||
NS_IMETHODIMP
|
||||
MimeTypeElementImpl::GetDescription(nsAWritableString& aDescription)
|
||||
MimeTypeElementImpl::GetDescription(nsAString& aDescription)
|
||||
{
|
||||
return mMimeType->GetDescription(aDescription);
|
||||
}
|
||||
|
|
@ -239,13 +239,13 @@ MimeTypeElementImpl::GetEnabledPlugin(nsIDOMPlugin** aEnabledPlugin)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
MimeTypeElementImpl::GetSuffixes(nsAWritableString& aSuffixes)
|
||||
MimeTypeElementImpl::GetSuffixes(nsAString& aSuffixes)
|
||||
{
|
||||
return mMimeType->GetSuffixes(aSuffixes);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
MimeTypeElementImpl::GetType(nsAWritableString& aType)
|
||||
MimeTypeElementImpl::GetType(nsAString& aType)
|
||||
{
|
||||
return mMimeType->GetType(aType);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ public:
|
|||
|
||||
NS_IMETHOD GetLength(PRUint32* aLength);
|
||||
NS_IMETHOD Item(PRUint32 aIndex, nsIDOMMimeType** aReturn);
|
||||
NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMMimeType** aReturn);
|
||||
NS_IMETHOD NamedItem(const nsAString& aName, nsIDOMMimeType** aReturn);
|
||||
nsresult Refresh();
|
||||
|
||||
private:
|
||||
|
|
@ -75,10 +75,10 @@ public:
|
|||
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
NS_IMETHOD GetDescription(nsAWritableString& aDescription);
|
||||
NS_IMETHOD GetDescription(nsAString& aDescription);
|
||||
NS_IMETHOD GetEnabledPlugin(nsIDOMPlugin** aEnabledPlugin);
|
||||
NS_IMETHOD GetSuffixes(nsAWritableString& aSuffixes);
|
||||
NS_IMETHOD GetType(nsAWritableString& aType);
|
||||
NS_IMETHOD GetSuffixes(nsAString& aSuffixes);
|
||||
NS_IMETHOD GetType(nsAString& aType);
|
||||
|
||||
protected:
|
||||
nsIDOMPlugin* mPlugin;
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ PluginArrayImpl::Item(PRUint32 aIndex, nsIDOMPlugin** aReturn)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
PluginArrayImpl::NamedItem(const nsAReadableString& aName,
|
||||
PluginArrayImpl::NamedItem(const nsAString& aName,
|
||||
nsIDOMPlugin** aReturn)
|
||||
{
|
||||
NS_PRECONDITION(nsnull != aReturn, "null arg");
|
||||
|
|
@ -313,19 +313,19 @@ NS_IMPL_RELEASE(PluginElementImpl)
|
|||
|
||||
|
||||
NS_IMETHODIMP
|
||||
PluginElementImpl::GetDescription(nsAWritableString& aDescription)
|
||||
PluginElementImpl::GetDescription(nsAString& aDescription)
|
||||
{
|
||||
return mPlugin->GetDescription(aDescription);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
PluginElementImpl::GetFilename(nsAWritableString& aFilename)
|
||||
PluginElementImpl::GetFilename(nsAString& aFilename)
|
||||
{
|
||||
return mPlugin->GetFilename(aFilename);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
PluginElementImpl::GetName(nsAWritableString& aName)
|
||||
PluginElementImpl::GetName(nsAString& aName)
|
||||
{
|
||||
return mPlugin->GetName(aName);
|
||||
}
|
||||
|
|
@ -354,7 +354,7 @@ PluginElementImpl::Item(PRUint32 aIndex, nsIDOMMimeType** aReturn)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
PluginElementImpl::NamedItem(const nsAReadableString& aName,
|
||||
PluginElementImpl::NamedItem(const nsAString& aName,
|
||||
nsIDOMMimeType** aReturn)
|
||||
{
|
||||
if (mMimeTypeArray == nsnull) {
|
||||
|
|
|
|||
|
|
@ -87,12 +87,12 @@ public:
|
|||
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
NS_IMETHOD GetDescription(nsAWritableString& aDescription);
|
||||
NS_IMETHOD GetFilename(nsAWritableString& aFilename);
|
||||
NS_IMETHOD GetName(nsAWritableString& aName);
|
||||
NS_IMETHOD GetDescription(nsAString& aDescription);
|
||||
NS_IMETHOD GetFilename(nsAString& aFilename);
|
||||
NS_IMETHOD GetName(nsAString& aName);
|
||||
NS_IMETHOD GetLength(PRUint32* aLength);
|
||||
NS_IMETHOD Item(PRUint32 aIndex, nsIDOMMimeType** aReturn);
|
||||
NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMMimeType** aReturn);
|
||||
NS_IMETHOD NamedItem(const nsAString& aName, nsIDOMMimeType** aReturn);
|
||||
|
||||
private:
|
||||
nsresult GetMimeTypes();
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ nsWindowRoot::~nsWindowRoot()
|
|||
NS_IMPL_ISUPPORTS4(nsWindowRoot, nsIDOMEventReceiver, nsIChromeEventHandler, nsPIWindowRoot, nsIDOMEventTarget)
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsWindowRoot::AddEventListener(const nsAReadableString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture)
|
||||
nsWindowRoot::AddEventListener(const nsAString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture)
|
||||
{
|
||||
nsCOMPtr<nsIEventListenerManager> manager;
|
||||
GetListenerManager(getter_AddRefs(manager));
|
||||
|
|
@ -71,7 +71,7 @@ nsWindowRoot::AddEventListener(const nsAReadableString& aType, nsIDOMEventListen
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsWindowRoot::RemoveEventListener(const nsAReadableString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture)
|
||||
nsWindowRoot::RemoveEventListener(const nsAString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture)
|
||||
{
|
||||
nsCOMPtr<nsIEventListenerManager> manager;
|
||||
GetListenerManager(getter_AddRefs(manager));
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#ifndef nsHTMLTags_h___
|
||||
#define nsHTMLTags_h___
|
||||
|
||||
#include "nsAReadableString.h"
|
||||
#include "nsAString.h"
|
||||
|
||||
/*
|
||||
Declare the enum list using the magic of preprocessing
|
||||
|
|
@ -70,7 +70,7 @@ public:
|
|||
static nsresult AddRefTable(void);
|
||||
static void ReleaseTable(void);
|
||||
|
||||
static nsHTMLTag LookupTag(const nsAReadableString& aTagName);
|
||||
static nsHTMLTag LookupTag(const nsAString& aTagName);
|
||||
static nsHTMLTag CaseSensitiveLookupTag(const PRUnichar* aTagName);
|
||||
static const PRUnichar *GetStringValue(nsHTMLTag aEnum);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -118,8 +118,8 @@ class CStartToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CStartToken(eHTMLTags aTag=eHTMLTag_unknown);
|
||||
CStartToken(const nsAReadableString& aString);
|
||||
CStartToken(const nsAReadableString& aName,eHTMLTags aTag);
|
||||
CStartToken(const nsAString& aString);
|
||||
CStartToken(const nsAString& aName,eHTMLTags aTag);
|
||||
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual PRInt32 GetTypeID(void);
|
||||
|
|
@ -131,7 +131,7 @@ class CStartToken: public CHTMLToken {
|
|||
#ifdef DEBUG
|
||||
virtual void DebugDumpSource(nsOutputStream& out);
|
||||
#endif
|
||||
virtual const nsAReadableString& GetStringValue();
|
||||
virtual const nsAString& GetStringValue();
|
||||
virtual void GetSource(nsString& anOutputString);
|
||||
virtual void AppendSource(nsString& anOutputString);
|
||||
|
||||
|
|
@ -174,8 +174,8 @@ class CEndToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CEndToken(eHTMLTags aTag);
|
||||
CEndToken(const nsAReadableString& aString);
|
||||
CEndToken(const nsAReadableString& aName,eHTMLTags aTag);
|
||||
CEndToken(const nsAString& aString);
|
||||
CEndToken(const nsAString& aName,eHTMLTags aTag);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual PRInt32 GetTypeID(void);
|
||||
virtual const char* GetClassName(void);
|
||||
|
|
@ -183,7 +183,7 @@ class CEndToken: public CHTMLToken {
|
|||
#ifdef DEBUG
|
||||
virtual void DebugDumpSource(nsOutputStream& out);
|
||||
#endif
|
||||
virtual const nsAReadableString& GetStringValue();
|
||||
virtual const nsAString& GetStringValue();
|
||||
virtual void GetSource(nsString& anOutputString);
|
||||
virtual void AppendSource(nsString& anOutputString);
|
||||
|
||||
|
|
@ -205,11 +205,11 @@ class CCommentToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CCommentToken();
|
||||
CCommentToken(const nsAReadableString& aString);
|
||||
CCommentToken(const nsAString& aString);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
char mLeadingChar;
|
||||
|
||||
protected:
|
||||
|
|
@ -229,7 +229,7 @@ class CEntityToken : public CHTMLToken {
|
|||
|
||||
public:
|
||||
CEntityToken();
|
||||
CEntityToken(const nsAReadableString& aString);
|
||||
CEntityToken(const nsAString& aString);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
PRInt32 TranslateToUnicodeStr(nsString& aString);
|
||||
|
|
@ -239,7 +239,7 @@ class CEntityToken : public CHTMLToken {
|
|||
#ifdef DEBUG
|
||||
virtual void DebugDumpSource(nsOutputStream& out);
|
||||
#endif
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
virtual void GetSource(nsString& anOutputString);
|
||||
virtual void AppendSource(nsString& anOutputString);
|
||||
|
||||
|
|
@ -260,11 +260,11 @@ class CWhitespaceToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CWhitespaceToken();
|
||||
CWhitespaceToken(const nsAReadableString& aString);
|
||||
CWhitespaceToken(const nsAString& aString);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
|
|
@ -282,17 +282,17 @@ class CTextToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CTextToken();
|
||||
CTextToken(const nsAReadableString& aString);
|
||||
CTextToken(const nsAString& aString);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
nsresult ConsumeUntil(PRUnichar aChar,PRBool aIgnoreComments,nsScanner& aScanner,
|
||||
nsString& aEndTagName,PRInt32 aMode,PRBool& aFlushTokens);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual PRInt32 GetTextLength(void);
|
||||
virtual void CopyTo(nsAWritableString& aStr);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual void CopyTo(nsAString& aStr);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
virtual void Bind(nsScanner* aScanner, nsReadingIterator<PRUnichar>& aStart, nsReadingIterator<PRUnichar>& aEnd);
|
||||
virtual void Bind(const nsAReadableString& aStr);
|
||||
virtual void Bind(const nsAString& aStr);
|
||||
|
||||
protected:
|
||||
nsSlidingSubstring mTextValue;
|
||||
|
|
@ -311,11 +311,11 @@ class CCDATASectionToken : public CHTMLToken {
|
|||
|
||||
public:
|
||||
CCDATASectionToken();
|
||||
CCDATASectionToken(const nsAReadableString& aString);
|
||||
CCDATASectionToken(const nsAString& aString);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
|
|
@ -333,11 +333,11 @@ class CMarkupDeclToken : public CHTMLToken {
|
|||
|
||||
public:
|
||||
CMarkupDeclToken();
|
||||
CMarkupDeclToken(const nsAReadableString& aString);
|
||||
CMarkupDeclToken(const nsAString& aString);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
protected:
|
||||
nsSlidingSubstring mTextValue;
|
||||
|
|
@ -357,21 +357,21 @@ class CAttributeToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CAttributeToken();
|
||||
CAttributeToken(const nsAReadableString& aString);
|
||||
CAttributeToken(const nsAReadableString& aKey, const nsAReadableString& aString);
|
||||
CAttributeToken(const nsAString& aString);
|
||||
CAttributeToken(const nsAString& aKey, const nsAString& aString);
|
||||
~CAttributeToken() {}
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetKey(void) {return mTextKey;}
|
||||
virtual void SetKey(const nsAReadableString& aKey);
|
||||
virtual const nsAString& GetKey(void) {return mTextKey;}
|
||||
virtual void SetKey(const nsAString& aKey);
|
||||
virtual void BindKey(nsScanner* aScanner, nsReadingIterator<PRUnichar>& aStart, nsReadingIterator<PRUnichar>& aEnd);
|
||||
virtual const nsAString& GetValue(void) {return mTextValue;}
|
||||
virtual void SanitizeKey();
|
||||
#ifdef DEBUG
|
||||
virtual void DebugDumpToken(nsOutputStream& out);
|
||||
#endif
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
virtual void GetSource(nsString& anOutputString);
|
||||
virtual void AppendSource(nsString& anOutputString);
|
||||
#ifdef DEBUG
|
||||
|
|
@ -402,7 +402,7 @@ class CNewlineToken: public CHTMLToken {
|
|||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
static void AllocNewline();
|
||||
static void FreeNewline();
|
||||
|
|
@ -423,10 +423,10 @@ class CScriptToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CScriptToken();
|
||||
CScriptToken(const nsAReadableString& aString);
|
||||
CScriptToken(const nsAString& aString);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
|
|
@ -446,10 +446,10 @@ class CStyleToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CStyleToken();
|
||||
CStyleToken(const nsAReadableString& aString);
|
||||
CStyleToken(const nsAString& aString);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
|
|
@ -468,11 +468,11 @@ class CInstructionToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CInstructionToken();
|
||||
CInstructionToken(const nsAReadableString& aString);
|
||||
CInstructionToken(const nsAString& aString);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
|
|
@ -494,7 +494,7 @@ public:
|
|||
// of nsParserError is returned which needs to be destroyed by the consumer?
|
||||
const nsParserError* GetError(void);
|
||||
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
nsParserError* mError;
|
||||
|
|
@ -511,12 +511,12 @@ class CDoctypeDeclToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CDoctypeDeclToken(eHTMLTags aTag=eHTMLTag_unknown);
|
||||
CDoctypeDeclToken(const nsAReadableString& aString,eHTMLTags aTag=eHTMLTag_unknown);
|
||||
CDoctypeDeclToken(const nsAString& aString,eHTMLTags aTag=eHTMLTag_unknown);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual void SetStringValue(const nsAReadableString& aStr);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
virtual void SetStringValue(const nsAString& aStr);
|
||||
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ public:
|
|||
* Set the document character set. This should be passed on to the
|
||||
* document itself.
|
||||
*/
|
||||
NS_IMETHOD SetDocumentCharset(nsAWritableString& aCharset)=0;
|
||||
NS_IMETHOD SetDocumentCharset(nsAString& aCharset)=0;
|
||||
};
|
||||
|
||||
#endif /* nsIContentSink_h___ */
|
||||
|
|
|
|||
|
|
@ -216,12 +216,12 @@ public:
|
|||
* Give rest of world access to our tag enums, so that CanContain(), etc,
|
||||
* become useful.
|
||||
*/
|
||||
NS_IMETHOD StringTagToIntTag(const nsAReadableString &aTag,
|
||||
NS_IMETHOD StringTagToIntTag(const nsAString &aTag,
|
||||
PRInt32* aIntTag) const = 0;
|
||||
|
||||
NS_IMETHOD_(const PRUnichar *) IntTagToStringTag(PRInt32 aIntTag) const = 0;
|
||||
|
||||
NS_IMETHOD ConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
NS_IMETHOD ConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const = 0;
|
||||
|
||||
NS_IMETHOD_(PRBool) IsBlockElement(PRInt32 aTagID,
|
||||
|
|
@ -245,9 +245,9 @@ public:
|
|||
NS_IMETHOD_(PRBool) CanContain(PRInt32 aParent,PRInt32 aChild) const;\
|
||||
NS_IMETHOD_(PRBool) IsContainer(PRInt32 aTag) const;\
|
||||
NS_IMETHOD_(void) Terminate();\
|
||||
NS_IMETHOD StringTagToIntTag(const nsAReadableString &aTag, PRInt32* aIntTag) const ;\
|
||||
NS_IMETHOD StringTagToIntTag(const nsAString &aTag, PRInt32* aIntTag) const ;\
|
||||
NS_IMETHOD_(const PRUnichar *) IntTagToStringTag(PRInt32 aIntTag) const ;\
|
||||
NS_IMETHOD ConvertEntityToUnicode(const nsAReadableString& aEntity, PRInt32* aUnicode) const ;\
|
||||
NS_IMETHOD ConvertEntityToUnicode(const nsAString& aEntity, PRInt32* aUnicode) const ;\
|
||||
NS_IMETHOD_(PRBool) IsBlockElement(PRInt32 aTagID,PRInt32 aParentID) const;\
|
||||
NS_IMETHOD_(PRBool) IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const;
|
||||
#endif /* nsIDTD_h___ */
|
||||
|
|
|
|||
|
|
@ -231,11 +231,11 @@ class nsIParser : public nsISupports {
|
|||
|
||||
virtual nsresult Parse(nsIURI* aURL,nsIRequestObserver* aListener = nsnull,PRBool aEnableVerify=PR_FALSE, void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect) = 0;
|
||||
virtual nsresult Parse(nsIInputStream& aStream, const nsACString& aMimeType,PRBool aEnableVerify=PR_FALSE, void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect) = 0;
|
||||
virtual nsresult Parse(const nsAReadableString& aSourceBuffer,void* aKey,const nsACString& aMimeType,PRBool aEnableVerify,PRBool aLastCall,nsDTDMode aMode=eDTDMode_autodetect) = 0;
|
||||
virtual nsresult Parse(const nsAString& aSourceBuffer,void* aKey,const nsACString& aMimeType,PRBool aEnableVerify,PRBool aLastCall,nsDTDMode aMode=eDTDMode_autodetect) = 0;
|
||||
|
||||
virtual nsresult Terminate(void) = 0;
|
||||
|
||||
virtual nsresult ParseFragment(const nsAReadableString& aSourceBuffer,
|
||||
virtual nsresult ParseFragment(const nsAString& aSourceBuffer,
|
||||
void* aKey,
|
||||
nsVoidArray& aTagStack,
|
||||
PRUint32 anInsertPos,
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ class nsIParserNode { // XXX Should be nsAParserNode
|
|||
* @update gess5/11/98
|
||||
* @return string containing node text
|
||||
*/
|
||||
virtual const nsAReadableString& GetText() const =0; //get plain text if available
|
||||
virtual const nsAString& GetText() const =0; //get plain text if available
|
||||
|
||||
/**
|
||||
* Retrieve skipped context from node
|
||||
|
|
@ -133,7 +133,7 @@ class nsIParserNode { // XXX Should be nsAParserNode
|
|||
* @param anIndex is the index of the key you want
|
||||
* @return string containing key.
|
||||
*/
|
||||
virtual const nsAReadableString& GetKeyAt(PRUint32 anIndex) const =0;
|
||||
virtual const nsAString& GetKeyAt(PRUint32 anIndex) const =0;
|
||||
|
||||
/**
|
||||
* Retrieve the value (of key/value pair) at given index
|
||||
|
|
|
|||
|
|
@ -76,13 +76,13 @@ class nsIParserService : public nsISupports {
|
|||
NS_IMETHOD HTMLCaseSensitiveAtomTagToId(nsIAtom* aAtom,
|
||||
PRInt32* aId) const = 0;
|
||||
|
||||
NS_IMETHOD HTMLStringTagToId(const nsAReadableString &aTagName,
|
||||
NS_IMETHOD HTMLStringTagToId(const nsAString &aTagName,
|
||||
PRInt32* aId) const = 0;
|
||||
|
||||
NS_IMETHOD HTMLIdToStringTag(PRInt32 aId,
|
||||
const PRUnichar **aTagName) const = 0;
|
||||
|
||||
NS_IMETHOD HTMLConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
NS_IMETHOD HTMLConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const = 0;
|
||||
|
||||
NS_IMETHOD HTMLConvertUnicodeToEntity(PRInt32 aUnicode,
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ class CToken {
|
|||
* @update gess5/11/98
|
||||
* @return reference to string containing string value
|
||||
*/
|
||||
virtual const nsAReadableString& GetStringValue(void) = 0;
|
||||
virtual const nsAString& GetStringValue(void) = 0;
|
||||
|
||||
/**
|
||||
* Get string of full contents, suitable for debug dump.
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ public:
|
|||
NS_IMETHOD WillResume(void) { return NS_OK; }
|
||||
NS_IMETHOD SetParser(nsIParser* aParser) { return NS_OK; }
|
||||
NS_IMETHOD FlushPendingNotifications() { return NS_OK; }
|
||||
NS_IMETHOD SetDocumentCharset(nsAWritableString& aCharset) { return NS_OK; }
|
||||
NS_IMETHOD SetDocumentCharset(nsAString& aCharset) { return NS_OK; }
|
||||
NS_IMETHOD WillProcessTokens(void) { return NS_OK; }
|
||||
NS_IMETHOD DidProcessTokens(void) { return NS_OK; }
|
||||
NS_IMETHOD WillProcessAToken(void) { return NS_OK; }
|
||||
|
|
@ -249,7 +249,7 @@ NS_IMETHODIMP RobotSink::OpenContainer(const nsIParserNode& aNode)
|
|||
PRInt32 ac = aNode.GetAttributeCount();
|
||||
for (PRInt32 i = 0; i < ac; i++) {
|
||||
// Get upper-cased key
|
||||
const nsAReadableString& key = aNode.GetKeyAt(i);
|
||||
const nsAString& key = aNode.GetKeyAt(i);
|
||||
k.Assign(key);
|
||||
ToLowerCase(k);
|
||||
if (k.Equals(NS_LITERAL_STRING("href"))) {
|
||||
|
|
|
|||
|
|
@ -697,8 +697,8 @@ PRBool DoesRequireBody(CToken* aToken,nsITokenizer* aTokenizer) {
|
|||
PRInt32 ac=aToken->GetAttributeCount();
|
||||
for(PRInt32 i=0; i<ac; i++) {
|
||||
CAttributeToken* attr=NS_STATIC_CAST(CAttributeToken*,aTokenizer->GetTokenAt(i));
|
||||
const nsAReadableString& name=attr->GetKey();
|
||||
const nsAReadableString& value=attr->GetValue();
|
||||
const nsAString& name=attr->GetKey();
|
||||
const nsAString& value=attr->GetValue();
|
||||
|
||||
if((name.Equals(NS_LITERAL_STRING("type")) ||
|
||||
name.Equals(NS_LITERAL_STRING("TYPE")))
|
||||
|
|
@ -2188,7 +2188,7 @@ nsresult CNavDTD::HandleCommentToken(CToken* aToken) {
|
|||
nsresult result=NS_OK;
|
||||
|
||||
CCommentToken* theToken = NS_STATIC_CAST(CCommentToken*,aToken);
|
||||
const nsAReadableString& theComment = theToken->GetStringValue();
|
||||
const nsAString& theComment = theToken->GetStringValue();
|
||||
mLineNumber += CountCharInReadable(theComment, PRUnichar(kNewLine));
|
||||
|
||||
nsCParserNode* theNode=mNodeAllocator.CreateNode(aToken,mLineNumber,mTokenAllocator);
|
||||
|
|
@ -2533,7 +2533,7 @@ PRBool CNavDTD::CanContain(PRInt32 aParent,PRInt32 aChild) const {
|
|||
* Give rest of world access to our tag enums, so that CanContain(), etc,
|
||||
* become useful.
|
||||
*/
|
||||
NS_IMETHODIMP CNavDTD::StringTagToIntTag(const nsAReadableString &aTag,
|
||||
NS_IMETHODIMP CNavDTD::StringTagToIntTag(const nsAString &aTag,
|
||||
PRInt32* aIntTag) const
|
||||
{
|
||||
*aIntTag = nsHTMLTags::LookupTag(aTag);
|
||||
|
|
@ -2553,7 +2553,7 @@ CNavDTD::IntTagToStringTag(PRInt32 aIntTag) const
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
CNavDTD::ConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
CNavDTD::ConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const
|
||||
{
|
||||
*aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
|
||||
|
|
|
|||
|
|
@ -903,7 +903,7 @@ PRBool COtherDTD::CanContain(PRInt32 aParent,PRInt32 aChild) const {
|
|||
* become useful.
|
||||
*/
|
||||
NS_IMETHODIMP
|
||||
COtherDTD::StringTagToIntTag(const nsAReadableString &aTag,
|
||||
COtherDTD::StringTagToIntTag(const nsAString &aTag,
|
||||
PRInt32* aIntTag) const
|
||||
{
|
||||
*aIntTag = nsHTMLTags::LookupTag(aTag);
|
||||
|
|
@ -923,7 +923,7 @@ COtherDTD::IntTagToStringTag(PRInt32 aIntTag) const
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
COtherDTD::ConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
COtherDTD::ConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const
|
||||
{
|
||||
*aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
|
||||
|
|
|
|||
|
|
@ -1240,7 +1240,7 @@ public:
|
|||
*
|
||||
* @return ptr to new token (or 0).
|
||||
*/
|
||||
CToken* nsTokenAllocator::CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag, const nsAReadableString& aString) {
|
||||
CToken* nsTokenAllocator::CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag, const nsAString& aString) {
|
||||
|
||||
CToken* result=0;
|
||||
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ public:
|
|||
|
||||
nsTokenAllocator();
|
||||
virtual ~nsTokenAllocator();
|
||||
virtual CToken* CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag, const nsAReadableString& aString);
|
||||
virtual CToken* CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag, const nsAString& aString);
|
||||
virtual CToken* CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag);
|
||||
|
||||
nsFixedSizeAllocator& GetArenaPool() { return mArenaPool; }
|
||||
|
|
@ -498,7 +498,7 @@ inline PRBool BufferContainsHTML(const nsString& aBuffer,
|
|||
PRInt32 theCount = 0;
|
||||
PRInt32 theTagCount = 0;
|
||||
|
||||
nsAReadableString::const_iterator iter, end;
|
||||
nsAString::const_iterator iter, end;
|
||||
aBuffer.BeginReading(iter);
|
||||
aBuffer.EndReading(end);
|
||||
|
||||
|
|
@ -516,7 +516,7 @@ inline PRBool BufferContainsHTML(const nsString& aBuffer,
|
|||
|
||||
++iter; // step over the '<' character
|
||||
|
||||
nsAReadableString::const_iterator tag_end(iter);
|
||||
nsAString::const_iterator tag_end(iter);
|
||||
|
||||
aBuffer.EndReading(end);
|
||||
|
||||
|
|
|
|||
|
|
@ -1007,7 +1007,7 @@ nsExpatDriver::CanContain(PRInt32 aParent,PRInt32 aChild) const
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsExpatDriver::StringTagToIntTag(const nsAReadableString &aTag, PRInt32* aIntTag) const
|
||||
nsExpatDriver::StringTagToIntTag(const nsAString &aTag, PRInt32* aIntTag) const
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -1019,7 +1019,7 @@ nsExpatDriver::IntTagToStringTag(PRInt32 aIntTag) const
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsExpatDriver::ConvertEntityToUnicode(const nsAReadableString& aEntity, PRInt32* aUnicode) const
|
||||
nsExpatDriver::ConvertEntityToUnicode(const nsAString& aEntity, PRInt32* aUnicode) const
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ nsHTMLEntities::EntityToUnicode(const nsCString& aEntity)
|
|||
|
||||
|
||||
PRInt32
|
||||
nsHTMLEntities::EntityToUnicode(const nsAReadableString& aEntity) {
|
||||
nsHTMLEntities::EntityToUnicode(const nsAString& aEntity) {
|
||||
nsCAutoString theEntity; theEntity.AssignWithConversion(aEntity);
|
||||
if(';'==theEntity.Last()) {
|
||||
theEntity.Truncate(theEntity.Length()-1);
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ public:
|
|||
* passed in must NOT have the leading "&" nor the trailing ";"
|
||||
* in it.
|
||||
*/
|
||||
static PRInt32 EntityToUnicode(const nsAReadableString& aEntity);
|
||||
static PRInt32 EntityToUnicode(const nsAString& aEntity);
|
||||
static PRInt32 EntityToUnicode(const nsCString& aEntity);
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ public:
|
|||
NS_IMETHOD AddComment(const nsIParserNode& aNode);
|
||||
NS_IMETHOD AddDocTypeDecl(const nsIParserNode& aNode, PRInt32 aMode=0);
|
||||
NS_IMETHOD FlushPendingNotifications() {return NS_OK; }
|
||||
NS_IMETHOD SetDocumentCharset(nsAWritableString& aCharset) {return NS_OK;}
|
||||
NS_IMETHOD SetDocumentCharset(nsAString& aCharset) {return NS_OK;}
|
||||
NS_IMETHOD NotifyTagObservers(nsIParserNode* aNode) { return NS_OK; }
|
||||
|
||||
// nsIHTMLContentSink
|
||||
|
|
@ -149,7 +149,7 @@ nsHTMLNullSink::~nsHTMLNullSink() {
|
|||
}
|
||||
|
||||
#ifdef VERBOSE_DEBUG
|
||||
static void DebugDump(const char* str1,const nsAReadableString& str2,PRInt32 tabs) {
|
||||
static void DebugDump(const char* str1,const nsAString& str2,PRInt32 tabs) {
|
||||
for(PRInt32 i=0;i<tabs;i++) {
|
||||
PR_fprintf(PR_STDOUT, " "); //add some tabbing to debug output...
|
||||
}
|
||||
|
|
|
|||
|
|
@ -399,7 +399,7 @@ nsHTMLTags::CaseSensitiveLookupTag(const PRUnichar* aTagName)
|
|||
|
||||
// static
|
||||
nsHTMLTag
|
||||
nsHTMLTags::LookupTag(const nsAReadableString& aTagName)
|
||||
nsHTMLTags::LookupTag(const nsAString& aTagName)
|
||||
{
|
||||
PRUint32 length = aTagName.Length();
|
||||
|
||||
|
|
@ -409,7 +409,7 @@ nsHTMLTags::LookupTag(const nsAReadableString& aTagName)
|
|||
|
||||
static PRUnichar buf[NS_HTMLTAG_NAME_MAX_LENGTH + 1];
|
||||
|
||||
nsAReadableString::const_iterator iter;
|
||||
nsAString::const_iterator iter;
|
||||
PRUint32 i = 0;
|
||||
PRUnichar c;
|
||||
|
||||
|
|
|
|||
|
|
@ -626,8 +626,8 @@ nsresult nsHTMLTokenizer::ConsumeAttributes(PRUnichar aChar,CStartToken* aToken,
|
|||
//start token it was empty.
|
||||
if(NS_SUCCEEDED(result)) {
|
||||
PRBool isUsableAttr = PR_TRUE;
|
||||
const nsAReadableString& key=theToken->GetKey();
|
||||
const nsAReadableString& text=theToken->GetValue();
|
||||
const nsAString& key=theToken->GetKey();
|
||||
const nsAString& text=theToken->GetValue();
|
||||
// support XML like syntax to fix bugs like 44186
|
||||
if(!key.IsEmpty() && kForwardSlash==key.First() && text.IsEmpty()) {
|
||||
isUsableAttr = PRBool(mFlags & NS_IPARSER_FLAG_VIEW_SOURCE); // Fix bug 103095
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ CStartToken::CStartToken(eHTMLTags aTag) : CHTMLToken(aTag) {
|
|||
#endif
|
||||
}
|
||||
|
||||
CStartToken::CStartToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
CStartToken::CStartToken(const nsAString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
mEmpty=PR_FALSE;
|
||||
mContainerInfo=eFormUnknown;
|
||||
mTextValue.Assign(aName);
|
||||
|
|
@ -106,7 +106,7 @@ CStartToken::CStartToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_u
|
|||
#endif
|
||||
}
|
||||
|
||||
CStartToken::CStartToken(const nsAReadableString& aName,eHTMLTags aTag) : CHTMLToken(aTag) {
|
||||
CStartToken::CStartToken(const nsAString& aName,eHTMLTags aTag) : CHTMLToken(aTag) {
|
||||
mEmpty=PR_FALSE;
|
||||
mContainerInfo=eFormUnknown;
|
||||
mTextValue.Assign(aName);
|
||||
|
|
@ -246,7 +246,7 @@ void CStartToken::DebugDumpSource(nsOutputStream& out) {
|
|||
}
|
||||
#endif
|
||||
|
||||
const nsAReadableString& CStartToken::GetStringValue()
|
||||
const nsAString& CStartToken::GetStringValue()
|
||||
{
|
||||
if((eHTMLTag_unknown<mTypeID) && (mTypeID<eHTMLTag_text)) {
|
||||
if(!mTextValue.Length()) {
|
||||
|
|
@ -312,11 +312,11 @@ void CStartToken::AppendSource(nsString& anOutputString){
|
|||
CEndToken::CEndToken(eHTMLTags aTag) : CHTMLToken(aTag) {
|
||||
}
|
||||
|
||||
CEndToken::CEndToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
CEndToken::CEndToken(const nsAString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
mTextValue.Assign(aName);
|
||||
}
|
||||
|
||||
CEndToken::CEndToken(const nsAReadableString& aName,eHTMLTags aTag) : CHTMLToken(aTag) {
|
||||
CEndToken::CEndToken(const nsAString& aName,eHTMLTags aTag) : CHTMLToken(aTag) {
|
||||
mTextValue.Assign(aName);
|
||||
}
|
||||
|
||||
|
|
@ -433,7 +433,7 @@ void CEndToken::DebugDumpSource(nsOutputStream& out) {
|
|||
}
|
||||
#endif
|
||||
|
||||
const nsAReadableString& CEndToken::GetStringValue()
|
||||
const nsAString& CEndToken::GetStringValue()
|
||||
{
|
||||
if((eHTMLTag_unknown<mTypeID) && (mTypeID<eHTMLTag_text)) {
|
||||
if(!mTextValue.Length()) {
|
||||
|
|
@ -493,7 +493,7 @@ CTextToken::CTextToken() : CHTMLToken(eHTMLTag_text) {
|
|||
* @param aName -- string to init token name with
|
||||
* @return
|
||||
*/
|
||||
CTextToken::CTextToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_text) {
|
||||
CTextToken::CTextToken(const nsAString& aName) : CHTMLToken(eHTMLTag_text) {
|
||||
mTextValue.Rebind(aName);
|
||||
}
|
||||
|
||||
|
|
@ -719,12 +719,12 @@ nsresult CTextToken::ConsumeUntil(PRUnichar aChar,PRBool aIgnoreComments,nsScann
|
|||
return result;
|
||||
}
|
||||
|
||||
void CTextToken::CopyTo(nsAWritableString& aStr)
|
||||
void CTextToken::CopyTo(nsAString& aStr)
|
||||
{
|
||||
aStr.Assign(mTextValue);
|
||||
}
|
||||
|
||||
const nsAReadableString& CTextToken::GetStringValue(void)
|
||||
const nsAString& CTextToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -734,7 +734,7 @@ void CTextToken::Bind(nsScanner* aScanner, nsReadingIterator<PRUnichar>& aStart,
|
|||
aScanner->BindSubstring(mTextValue, aStart, aEnd);
|
||||
}
|
||||
|
||||
void CTextToken::Bind(const nsAReadableString& aStr)
|
||||
void CTextToken::Bind(const nsAString& aStr)
|
||||
{
|
||||
mTextValue.Rebind(aStr);
|
||||
}
|
||||
|
|
@ -757,7 +757,7 @@ CCDATASectionToken::CCDATASectionToken() : CHTMLToken(eHTMLTag_unknown) {
|
|||
* @param aName -- string to init token name with
|
||||
* @return
|
||||
*/
|
||||
CCDATASectionToken::CCDATASectionToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
CCDATASectionToken::CCDATASectionToken(const nsAString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
mTextValue.Assign(aName);
|
||||
}
|
||||
|
||||
|
|
@ -841,7 +841,7 @@ nsresult CCDATASectionToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt3
|
|||
return result;
|
||||
}
|
||||
|
||||
const nsAReadableString& CCDATASectionToken::GetStringValue(void)
|
||||
const nsAString& CCDATASectionToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -863,7 +863,7 @@ CMarkupDeclToken::CMarkupDeclToken() : CHTMLToken(eHTMLTag_markupDecl) {
|
|||
* @param aName -- string to init token name with
|
||||
* @return
|
||||
*/
|
||||
CMarkupDeclToken::CMarkupDeclToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_markupDecl) {
|
||||
CMarkupDeclToken::CMarkupDeclToken(const nsAString& aName) : CHTMLToken(eHTMLTag_markupDecl) {
|
||||
mTextValue.Rebind(aName);
|
||||
}
|
||||
|
||||
|
|
@ -978,7 +978,7 @@ nsresult CMarkupDeclToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32
|
|||
return result;
|
||||
}
|
||||
|
||||
const nsAReadableString& CMarkupDeclToken::GetStringValue(void)
|
||||
const nsAString& CMarkupDeclToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -1002,7 +1002,7 @@ CCommentToken::CCommentToken() : CHTMLToken(eHTMLTag_comment) {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
CCommentToken::CCommentToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_comment) {
|
||||
CCommentToken::CCommentToken(const nsAString& aName) : CHTMLToken(eHTMLTag_comment) {
|
||||
mTextValue.Assign(aName);
|
||||
}
|
||||
|
||||
|
|
@ -1270,7 +1270,7 @@ nsresult CCommentToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aFl
|
|||
return result;
|
||||
}
|
||||
|
||||
const nsAReadableString& CCommentToken::GetStringValue(void)
|
||||
const nsAString& CCommentToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -1351,7 +1351,7 @@ void CNewlineToken::FreeNewline()
|
|||
* @update gess 3/25/98
|
||||
* @return nsString reference to internal string value
|
||||
*/
|
||||
const nsAReadableString& CNewlineToken::GetStringValue(void) {
|
||||
const nsAString& CNewlineToken::GetStringValue(void) {
|
||||
return *gNewlineStr;
|
||||
}
|
||||
|
||||
|
|
@ -1419,7 +1419,7 @@ CAttributeToken::CAttributeToken() : CHTMLToken(eHTMLTag_unknown) {
|
|||
* @param aName -- string value to init token name with
|
||||
* @return
|
||||
*/
|
||||
CAttributeToken::CAttributeToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
CAttributeToken::CAttributeToken(const nsAString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
mTextValue.Assign(aName);
|
||||
mHasEqualWithoutValue=PR_FALSE;
|
||||
#ifdef DEBUG
|
||||
|
|
@ -1435,7 +1435,7 @@ CAttributeToken::CAttributeToken(const nsAReadableString& aName) : CHTMLToken(eH
|
|||
* @param aName -- string value to init token name with
|
||||
* @return
|
||||
*/
|
||||
CAttributeToken::CAttributeToken(const nsAReadableString& aKey, const nsAReadableString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
CAttributeToken::CAttributeToken(const nsAString& aKey, const nsAString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
mTextValue.Assign(aName);
|
||||
mTextKey.Rebind(aKey);
|
||||
mHasEqualWithoutValue=PR_FALSE;
|
||||
|
|
@ -1517,7 +1517,7 @@ void CAttributeToken::DebugDumpToken(nsOutputStream& out) {
|
|||
}
|
||||
#endif
|
||||
|
||||
const nsAReadableString& CAttributeToken::GetStringValue(void)
|
||||
const nsAString& CAttributeToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -1859,7 +1859,7 @@ void CAttributeToken::DebugDumpSource(nsOutputStream& out) {
|
|||
}
|
||||
#endif
|
||||
|
||||
void CAttributeToken::SetKey(const nsAReadableString& aKey)
|
||||
void CAttributeToken::SetKey(const nsAString& aKey)
|
||||
{
|
||||
mTextKey.Rebind(aKey);
|
||||
}
|
||||
|
|
@ -1889,7 +1889,7 @@ CWhitespaceToken::CWhitespaceToken() : CHTMLToken(eHTMLTag_whitespace) {
|
|||
* @param aName -- string value to init token name with
|
||||
* @return
|
||||
*/
|
||||
CWhitespaceToken::CWhitespaceToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_whitespace) {
|
||||
CWhitespaceToken::CWhitespaceToken(const nsAString& aName) : CHTMLToken(eHTMLTag_whitespace) {
|
||||
mTextValue.Assign(aName);
|
||||
}
|
||||
|
||||
|
|
@ -1933,7 +1933,7 @@ nsresult CWhitespaceToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32
|
|||
return result;
|
||||
}
|
||||
|
||||
const nsAReadableString& CWhitespaceToken::GetStringValue(void)
|
||||
const nsAString& CWhitespaceToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -1955,7 +1955,7 @@ CEntityToken::CEntityToken() : CHTMLToken(eHTMLTag_entity) {
|
|||
* @param aName -- string value to init token name with
|
||||
* @return
|
||||
*/
|
||||
CEntityToken::CEntityToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_entity) {
|
||||
CEntityToken::CEntityToken(const nsAString& aName) : CHTMLToken(eHTMLTag_entity) {
|
||||
mTextValue.Assign(aName);
|
||||
#ifdef VERBOSE_DEBUG
|
||||
if(!VerifyEntityTable()) {
|
||||
|
|
@ -2212,7 +2212,7 @@ void CEntityToken::DebugDumpSource(nsOutputStream& out) {
|
|||
}
|
||||
#endif
|
||||
|
||||
const nsAReadableString& CEntityToken::GetStringValue(void)
|
||||
const nsAString& CEntityToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -2260,7 +2260,7 @@ CScriptToken::CScriptToken() : CHTMLToken(eHTMLTag_script) {
|
|||
* @param aName -- string to init token name with
|
||||
* @return
|
||||
*/
|
||||
CScriptToken::CScriptToken(const nsAReadableString& aString) : CHTMLToken(eHTMLTag_script) {
|
||||
CScriptToken::CScriptToken(const nsAString& aString) : CHTMLToken(eHTMLTag_script) {
|
||||
mTextValue.Assign(aString);
|
||||
}
|
||||
|
||||
|
|
@ -2287,7 +2287,7 @@ PRInt32 CScriptToken::GetTokenType(void) {
|
|||
return eToken_script;
|
||||
}
|
||||
|
||||
const nsAReadableString& CScriptToken::GetStringValue(void)
|
||||
const nsAString& CScriptToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -2302,7 +2302,7 @@ const nsAReadableString& CScriptToken::GetStringValue(void)
|
|||
CStyleToken::CStyleToken() : CHTMLToken(eHTMLTag_style) {
|
||||
}
|
||||
|
||||
CStyleToken::CStyleToken(const nsAReadableString& aString) : CHTMLToken(eHTMLTag_style) {
|
||||
CStyleToken::CStyleToken(const nsAString& aString) : CHTMLToken(eHTMLTag_style) {
|
||||
mTextValue.Assign(aString);
|
||||
}
|
||||
|
||||
|
|
@ -2328,7 +2328,7 @@ PRInt32 CStyleToken::GetTokenType(void) {
|
|||
return eToken_style;
|
||||
}
|
||||
|
||||
const nsAReadableString& CStyleToken::GetStringValue(void)
|
||||
const nsAString& CStyleToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -2372,7 +2372,7 @@ CInstructionToken::CInstructionToken() : CHTMLToken(eHTMLTag_instruction) {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
CInstructionToken::CInstructionToken(const nsAReadableString& aString) : CHTMLToken(eHTMLTag_unknown) {
|
||||
CInstructionToken::CInstructionToken(const nsAString& aString) : CHTMLToken(eHTMLTag_unknown) {
|
||||
mTextValue.Assign(aString);
|
||||
}
|
||||
|
||||
|
|
@ -2411,7 +2411,7 @@ PRInt32 CInstructionToken::GetTokenType(void){
|
|||
return eToken_instruction;
|
||||
}
|
||||
|
||||
const nsAReadableString& CInstructionToken::GetStringValue(void)
|
||||
const nsAString& CInstructionToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -2444,7 +2444,7 @@ const nsParserError * CErrorToken::GetError(void)
|
|||
return mError;
|
||||
}
|
||||
|
||||
const nsAReadableString& CErrorToken::GetStringValue(void)
|
||||
const nsAString& CErrorToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -2455,7 +2455,7 @@ CDoctypeDeclToken::CDoctypeDeclToken(eHTMLTags aTag)
|
|||
: CHTMLToken(aTag) {
|
||||
}
|
||||
|
||||
CDoctypeDeclToken::CDoctypeDeclToken(const nsAReadableString& aString,eHTMLTags aTag)
|
||||
CDoctypeDeclToken::CDoctypeDeclToken(const nsAString& aString,eHTMLTags aTag)
|
||||
: CHTMLToken(aTag), mTextValue(aString) {
|
||||
}
|
||||
|
||||
|
|
@ -2515,12 +2515,12 @@ PRInt32 CDoctypeDeclToken::GetTokenType(void) {
|
|||
return eToken_doctypeDecl;
|
||||
}
|
||||
|
||||
const nsAReadableString& CDoctypeDeclToken::GetStringValue(void)
|
||||
const nsAString& CDoctypeDeclToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
||||
void CDoctypeDeclToken::SetStringValue(const nsAReadableString& aStr)
|
||||
void CDoctypeDeclToken::SetStringValue(const nsAString& aStr)
|
||||
{
|
||||
mTextValue.Assign(aStr);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -575,7 +575,7 @@ nsLoggingSink::WriteAttributes(const nsIParserNode& aNode) {
|
|||
for (PRInt32 i = 0; i < ac; i++) {
|
||||
char* key=nsnull;
|
||||
char* value=nsnull;
|
||||
const nsAReadableString& k = aNode.GetKeyAt(i);
|
||||
const nsAString& k = aNode.GetKeyAt(i);
|
||||
const nsAString& v = aNode.GetValueAt(i);
|
||||
|
||||
GetNewCString(k, &key);
|
||||
|
|
@ -697,7 +697,7 @@ nsLoggingSink::LeafNode(const nsIParserNode& aNode)
|
|||
}
|
||||
|
||||
nsresult
|
||||
nsLoggingSink::QuoteText(const nsAReadableString& aValue, nsString& aResult) {
|
||||
nsLoggingSink::QuoteText(const nsAString& aValue, nsString& aResult) {
|
||||
aResult.Truncate();
|
||||
/*
|
||||
if you're stepping through the string anyway, why not use iterators instead of forcing the string to copy?
|
||||
|
|
@ -734,7 +734,7 @@ nsLoggingSink::QuoteText(const nsAReadableString& aValue, nsString& aResult) {
|
|||
* @param aResult - String coverted to char*.
|
||||
*/
|
||||
nsresult
|
||||
nsLoggingSink::GetNewCString(const nsAReadableString& aValue, char** aResult)
|
||||
nsLoggingSink::GetNewCString(const nsAString& aValue, char** aResult)
|
||||
{
|
||||
nsresult result=NS_OK;
|
||||
nsAutoString temp;
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ public:
|
|||
NS_IMETHOD AddProcessingInstruction(const nsIParserNode& aNode);
|
||||
NS_IMETHOD AddDocTypeDecl(const nsIParserNode& aNode, PRInt32 aMode=0);
|
||||
NS_IMETHOD FlushPendingNotifications() { return NS_OK; }
|
||||
NS_IMETHOD SetDocumentCharset(nsAWritableString& aCharset) { return NS_OK; }
|
||||
NS_IMETHOD SetDocumentCharset(nsAString& aCharset) { return NS_OK; }
|
||||
NS_IMETHOD NotifyTagObservers(nsIParserNode* aNode) { return NS_OK; }
|
||||
|
||||
// nsIHTMLContentSink
|
||||
|
|
@ -105,8 +105,8 @@ public:
|
|||
nsresult CloseNode(const char* aKind);
|
||||
nsresult LeafNode(const nsIParserNode& aNode);
|
||||
nsresult WriteAttributes(const nsIParserNode& aNode);
|
||||
nsresult QuoteText(const nsAReadableString& aValue, nsString& aResult);
|
||||
nsresult GetNewCString(const nsAReadableString& aValue, char** aResult);
|
||||
nsresult QuoteText(const nsAString& aValue, nsString& aResult);
|
||||
nsresult GetNewCString(const nsAString& aValue, char** aResult);
|
||||
PRBool WillWriteAttributes(const nsIParserNode& aNode);
|
||||
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -501,7 +501,7 @@ void nsParser::SetDocumentCharset(const nsAString& aCharset, PRInt32 aCharsetSou
|
|||
mParserContext->mScanner->SetDocumentCharset(aCharset, aCharsetSource);
|
||||
}
|
||||
|
||||
void nsParser::SetSinkCharset(nsAWritableString& aCharset)
|
||||
void nsParser::SetSinkCharset(nsAString& aCharset)
|
||||
{
|
||||
if (mSink) {
|
||||
mSink->SetDocumentCharset(aCharset);
|
||||
|
|
@ -1531,7 +1531,7 @@ nsresult nsParser::Parse(nsIInputStream& aStream,const nsACString& aMimeType,PRB
|
|||
* @param aMimeType tells us what type of content to expect in the given string
|
||||
* @return error code -- 0 if ok, non-zero if error.
|
||||
*/
|
||||
nsresult nsParser::Parse(const nsAReadableString& aSourceBuffer, void* aKey,
|
||||
nsresult nsParser::Parse(const nsAString& aSourceBuffer, void* aKey,
|
||||
const nsACString& aMimeType,
|
||||
PRBool aVerifyEnabled, PRBool aLastCall,
|
||||
nsDTDMode aMode){
|
||||
|
|
@ -1641,7 +1641,7 @@ nsresult nsParser::Parse(const nsAReadableString& aSourceBuffer, void* aKey,
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
nsresult nsParser::ParseFragment(const nsAReadableString& aSourceBuffer,
|
||||
nsresult nsParser::ParseFragment(const nsAString& aSourceBuffer,
|
||||
void* aKey,
|
||||
nsVoidArray& aTagStack,
|
||||
PRUint32 anInsertPos,
|
||||
|
|
|
|||
|
|
@ -212,9 +212,9 @@ class nsParser : public nsIParser,
|
|||
* @param appendTokens tells us whether we should insert tokens inline, or append them.
|
||||
* @return TRUE if all went well -- FALSE otherwise
|
||||
*/
|
||||
virtual nsresult Parse(const nsAReadableString& aSourceBuffer,void* aKey,const nsACString& aContentType,PRBool aEnableVerify=PR_FALSE,PRBool aLastCall=PR_FALSE,nsDTDMode aMode=eDTDMode_autodetect);
|
||||
virtual nsresult Parse(const nsAString& aSourceBuffer,void* aKey,const nsACString& aContentType,PRBool aEnableVerify=PR_FALSE,PRBool aLastCall=PR_FALSE,nsDTDMode aMode=eDTDMode_autodetect);
|
||||
|
||||
virtual nsresult ParseFragment(const nsAReadableString& aSourceBuffer,
|
||||
virtual nsresult ParseFragment(const nsAString& aSourceBuffer,
|
||||
void* aKey,
|
||||
nsVoidArray& aTagStack,
|
||||
PRUint32 anInsertPos,
|
||||
|
|
@ -324,7 +324,7 @@ class nsParser : public nsIParser,
|
|||
nsString& oCharset,
|
||||
PRInt32& oCharsetSource);
|
||||
|
||||
void SetSinkCharset(nsAWritableString& aCharset);
|
||||
void SetSinkCharset(nsAString& aCharset);
|
||||
|
||||
/**
|
||||
* Removes continue parsing events
|
||||
|
|
|
|||
|
|
@ -197,8 +197,8 @@ const nsString& nsCParserNode::GetName() const {
|
|||
* @param
|
||||
* @return string ref of text from internal token
|
||||
*/
|
||||
const nsAReadableString& nsCParserNode::GetText() const {
|
||||
return (mToken) ? mToken->GetStringValue() : NS_STATIC_CAST(const nsAReadableString&,GetEmptyString());
|
||||
const nsAString& nsCParserNode::GetText() const {
|
||||
return (mToken) ? mToken->GetStringValue() : NS_STATIC_CAST(const nsAString&,GetEmptyString());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -283,7 +283,7 @@ PRInt32 nsCParserNode::GetAttributeCount(PRBool askToken) const{
|
|||
* @param anIndex-- offset of attribute to retrieve
|
||||
* @return string rep of given attribute text key
|
||||
*/
|
||||
const nsAReadableString& nsCParserNode::GetKeyAt(PRUint32 anIndex) const {
|
||||
const nsAString& nsCParserNode::GetKeyAt(PRUint32 anIndex) const {
|
||||
PRInt32 theCount = (mAttributes) ? mAttributes->GetSize() : 0;
|
||||
if((PRInt32)anIndex<theCount) {
|
||||
CAttributeToken* tkn=(CAttributeToken*)mAttributes->ObjectAt(anIndex);
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ class nsCParserNode : public nsIParserNode {
|
|||
* @update gess5/11/98
|
||||
* @return string containing node text
|
||||
*/
|
||||
virtual const nsAReadableString& GetText() const;
|
||||
virtual const nsAString& GetText() const;
|
||||
|
||||
/**
|
||||
* Retrieve skipped context from node
|
||||
|
|
@ -206,7 +206,7 @@ class nsCParserNode : public nsIParserNode {
|
|||
* @param anIndex is the index of the key you want
|
||||
* @return string containing key.
|
||||
*/
|
||||
virtual const nsAReadableString& GetKeyAt(PRUint32 anIndex) const;
|
||||
virtual const nsAString& GetKeyAt(PRUint32 anIndex) const;
|
||||
|
||||
/**
|
||||
* Retrieve the value (of key/value pair) at given index
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ nsParserService::HTMLCaseSensitiveAtomTagToId(nsIAtom* aAtom,
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsParserService::HTMLStringTagToId(const nsAReadableString &aTagName,
|
||||
nsParserService::HTMLStringTagToId(const nsAString &aTagName,
|
||||
PRInt32* aId) const
|
||||
{
|
||||
*aId = nsHTMLTags::LookupTag(aTagName);
|
||||
|
|
@ -84,7 +84,7 @@ nsParserService::HTMLIdToStringTag(PRInt32 aId,
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsParserService::HTMLConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
nsParserService::HTMLConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const
|
||||
{
|
||||
*aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
|
||||
|
|
|
|||
|
|
@ -36,12 +36,12 @@ public:
|
|||
|
||||
NS_IMETHOD HTMLCaseSensitiveAtomTagToId(nsIAtom* aAtom, PRInt32* aId) const;
|
||||
|
||||
NS_IMETHOD HTMLStringTagToId(const nsAReadableString &aTagName,
|
||||
NS_IMETHOD HTMLStringTagToId(const nsAString &aTagName,
|
||||
PRInt32* aId) const;
|
||||
|
||||
NS_IMETHOD HTMLIdToStringTag(PRInt32 aId, const PRUnichar **aTagName) const;
|
||||
|
||||
NS_IMETHOD HTMLConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
NS_IMETHOD HTMLConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const;
|
||||
NS_IMETHOD HTMLConvertUnicodeToEntity(PRInt32 aUnicode,
|
||||
nsCString& aEntity) const;
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ void nsScanner::Mark() {
|
|||
* @update harishd 01/12/99
|
||||
* @return error code
|
||||
*/
|
||||
PRBool nsScanner::UngetReadable(const nsAReadableString& aBuffer) {
|
||||
PRBool nsScanner::UngetReadable(const nsAString& aBuffer) {
|
||||
|
||||
mSlidingBuffer->UngetReadable(aBuffer,mCurrentPosition);
|
||||
mSlidingBuffer->BeginReading(mCurrentPosition); // Insertion invalidated our iterators
|
||||
|
|
@ -309,7 +309,7 @@ PRBool nsScanner::UngetReadable(const nsAReadableString& aBuffer) {
|
|||
* @update gess4/3/98
|
||||
* @return error code
|
||||
*/
|
||||
nsresult nsScanner::Append(const nsAReadableString& aBuffer) {
|
||||
nsresult nsScanner::Append(const nsAString& aBuffer) {
|
||||
|
||||
PRUnichar* buffer = ToNewUnicode(aBuffer);
|
||||
PRUint32 bufLen = aBuffer.Length();
|
||||
|
|
@ -527,7 +527,7 @@ nsresult nsScanner::Peek(PRUnichar& aChar, PRUint32 aOffset) {
|
|||
return result;
|
||||
}
|
||||
|
||||
nsresult nsScanner::Peek(nsAWritableString& aStr, PRInt32 aNumChars)
|
||||
nsresult nsScanner::Peek(nsAString& aStr, PRInt32 aNumChars)
|
||||
{
|
||||
if (!mSlidingBuffer) {
|
||||
return kEOF;
|
||||
|
|
@ -1193,7 +1193,7 @@ nsresult nsScanner::ReadWhile(nsString& aString,
|
|||
* the set of INVALID characters
|
||||
* @return error code
|
||||
*/
|
||||
nsresult nsScanner::ReadUntil(nsAWritableString& aString,
|
||||
nsresult nsScanner::ReadUntil(nsAString& aString,
|
||||
const nsReadEndCondition& aEndCondition,
|
||||
PRBool addTerminal)
|
||||
{
|
||||
|
|
@ -1317,7 +1317,7 @@ nsresult nsScanner::ReadUntil(nsReadingIterator<PRUnichar>& aStart,
|
|||
* @param
|
||||
* @return error code
|
||||
*/
|
||||
nsresult nsScanner::ReadUntil(nsAWritableString& aString,
|
||||
nsresult nsScanner::ReadUntil(nsAString& aString,
|
||||
PRUnichar aTerminalChar,
|
||||
PRBool addTerminal)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ class nsScannerString : public nsSlidingString {
|
|||
PRUnichar* aDataEnd,
|
||||
PRUnichar* aStorageEnd);
|
||||
|
||||
virtual void UngetReadable(const nsAReadableString& aReadable, const nsReadingIterator<PRUnichar>& aCurrentPosition) { InsertReadable(aReadable,aCurrentPosition); }
|
||||
virtual void UngetReadable(const nsAString& aReadable, const nsReadingIterator<PRUnichar>& aCurrentPosition) { InsertReadable(aReadable,aCurrentPosition); }
|
||||
virtual void ReplaceCharacter(nsReadingIterator<PRUnichar>& aPosition,
|
||||
PRUnichar aChar);
|
||||
};
|
||||
|
|
@ -141,7 +141,7 @@ class nsScanner {
|
|||
*/
|
||||
nsresult Peek(PRUnichar& ch, PRUint32 aOffset=0);
|
||||
|
||||
nsresult Peek(nsAWritableString& aStr, PRInt32 aNumChars);
|
||||
nsresult Peek(nsAString& aStr, PRInt32 aNumChars);
|
||||
|
||||
/**
|
||||
* Skip over chars as long as they're in aSkipSet
|
||||
|
|
@ -227,7 +227,7 @@ class nsScanner {
|
|||
* @param addTerminal tells us whether to append terminal to aString
|
||||
* @return error code
|
||||
*/
|
||||
nsresult ReadUntil(nsAWritableString& aString,
|
||||
nsresult ReadUntil(nsAString& aString,
|
||||
PRUnichar aTerminal,
|
||||
PRBool addTerminal);
|
||||
|
||||
|
|
@ -241,7 +241,7 @@ class nsScanner {
|
|||
* @param addTerminal tells us whether to append terminal to aString
|
||||
* @return error code
|
||||
*/
|
||||
nsresult ReadUntil(nsAWritableString& aString,
|
||||
nsresult ReadUntil(nsAString& aString,
|
||||
const nsReadEndCondition& aEndCondition,
|
||||
PRBool addTerminal);
|
||||
|
||||
|
|
@ -293,7 +293,7 @@ class nsScanner {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
PRBool UngetReadable(const nsAReadableString& aBuffer);
|
||||
PRBool UngetReadable(const nsAString& aBuffer);
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -302,7 +302,7 @@ class nsScanner {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
nsresult Append(const nsAReadableString& aBuffer);
|
||||
nsresult Append(const nsAString& aBuffer);
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
|
|||
|
|
@ -180,15 +180,15 @@ public:
|
|||
mIndirectString=0;
|
||||
}
|
||||
|
||||
void SetIndirectString(const nsAReadableString& aString) {
|
||||
void SetIndirectString(const nsAString& aString) {
|
||||
mIndirectString=&aString;
|
||||
}
|
||||
|
||||
virtual const nsAReadableString& GetStringValue(void){
|
||||
return (nsAReadableString&)*mIndirectString;
|
||||
virtual const nsAString& GetStringValue(void){
|
||||
return (const nsAString&)*mIndirectString;
|
||||
}
|
||||
|
||||
const nsAReadableString* mIndirectString;
|
||||
const nsAString* mIndirectString;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -830,7 +830,7 @@ PRBool CViewSourceHTML::CanContain(PRInt32 aParent,PRInt32 aChild) const{
|
|||
* become useful.
|
||||
*/
|
||||
NS_IMETHODIMP
|
||||
CViewSourceHTML::StringTagToIntTag(const nsAReadableString &aTag,
|
||||
CViewSourceHTML::StringTagToIntTag(const nsAString &aTag,
|
||||
PRInt32* aIntTag) const
|
||||
{
|
||||
*aIntTag = nsHTMLTags::LookupTag(aTag);
|
||||
|
|
@ -850,7 +850,7 @@ CViewSourceHTML::IntTagToStringTag(PRInt32 aIntTag) const
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
CViewSourceHTML::ConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
CViewSourceHTML::ConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const
|
||||
{
|
||||
*aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
|
||||
|
|
@ -906,7 +906,7 @@ nsresult CViewSourceHTML::WriteAttributes(PRInt32 attrCount) {
|
|||
theContext.mTokenNode.AddAttribute(theToken); //and add it to the node.
|
||||
|
||||
CAttributeToken* theAttrToken=(CAttributeToken*)theToken;
|
||||
const nsAReadableString& theKey=theAttrToken->GetKey();
|
||||
const nsAString& theKey=theAttrToken->GetKey();
|
||||
|
||||
result=WriteTag(mKey,theKey,0,PR_FALSE);
|
||||
const nsAString& theValue=theAttrToken->GetValue();
|
||||
|
|
@ -930,7 +930,7 @@ nsresult CViewSourceHTML::WriteAttributes(PRInt32 attrCount) {
|
|||
* @param
|
||||
* @return result status
|
||||
*/
|
||||
nsresult CViewSourceHTML::WriteTag(PRInt32 aTagType,const nsAReadableString & aText,PRInt32 attrCount,PRBool aNewlineRequired) {
|
||||
nsresult CViewSourceHTML::WriteTag(PRInt32 aTagType,const nsAString & aText,PRInt32 attrCount,PRBool aNewlineRequired) {
|
||||
static nsString theString;
|
||||
|
||||
nsresult result=NS_OK;
|
||||
|
|
@ -1044,7 +1044,7 @@ NS_IMETHODIMP CViewSourceHTML::HandleToken(CToken* aToken,nsIParser* aParser) {
|
|||
{
|
||||
mTagCount++;
|
||||
|
||||
const nsAReadableString& startValue = aToken->GetStringValue();
|
||||
const nsAString& startValue = aToken->GetStringValue();
|
||||
result=WriteTag(mStartTag,startValue,aToken->GetAttributeCount(),PR_TRUE);
|
||||
|
||||
if((ePlainText!=mDocType) && mParser && (NS_OK==result)) {
|
||||
|
|
@ -1058,7 +1058,7 @@ NS_IMETHODIMP CViewSourceHTML::HandleToken(CToken* aToken,nsIParser* aParser) {
|
|||
if(theParent==theChild) {
|
||||
mTags.Truncate(mTags.Length()-1);
|
||||
}
|
||||
const nsAReadableString& endValue = aToken->GetStringValue();
|
||||
const nsAString& endValue = aToken->GetStringValue();
|
||||
result=WriteTag(mEndTag,endValue,0,PR_TRUE);
|
||||
}
|
||||
break;
|
||||
|
|
@ -1095,14 +1095,14 @@ NS_IMETHODIMP CViewSourceHTML::HandleToken(CToken* aToken,nsIParser* aParser) {
|
|||
|
||||
case eToken_doctypeDecl:
|
||||
{
|
||||
const nsAReadableString& doctypeValue = aToken->GetStringValue();
|
||||
const nsAString& doctypeValue = aToken->GetStringValue();
|
||||
result=WriteTag(mDocTypeTag,doctypeValue,0,PR_TRUE);
|
||||
}
|
||||
break;
|
||||
|
||||
case eToken_newline:
|
||||
{
|
||||
const nsAReadableString& newlineValue = aToken->GetStringValue();
|
||||
const nsAString& newlineValue = aToken->GetStringValue();
|
||||
mLineNumber++;
|
||||
result=WriteTag(mText,newlineValue,0,PR_FALSE);
|
||||
mTokenCount++;
|
||||
|
|
@ -1114,7 +1114,7 @@ NS_IMETHODIMP CViewSourceHTML::HandleToken(CToken* aToken,nsIParser* aParser) {
|
|||
|
||||
case eToken_whitespace:
|
||||
{
|
||||
const nsAReadableString& wsValue = aToken->GetStringValue();
|
||||
const nsAString& wsValue = aToken->GetStringValue();
|
||||
result=WriteTag(mText,wsValue,0,PR_FALSE);
|
||||
mTokenCount++;
|
||||
if (NS_VIEWSOURCE_TOKENS_PER_BLOCK > 0 &&
|
||||
|
|
@ -1129,7 +1129,7 @@ NS_IMETHODIMP CViewSourceHTML::HandleToken(CToken* aToken,nsIParser* aParser) {
|
|||
|
||||
case eToken_text:
|
||||
{
|
||||
const nsAReadableString& str = aToken->GetStringValue();
|
||||
const nsAString& str = aToken->GetStringValue();
|
||||
result=WriteTag(mText,str,aToken->GetAttributeCount(),PR_TRUE);
|
||||
mTokenCount++;
|
||||
if (NS_VIEWSOURCE_TOKENS_PER_BLOCK > 0 &&
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ public:
|
|||
|
||||
private:
|
||||
nsresult WriteTag(PRInt32 tagType,
|
||||
const nsAReadableString &aText,
|
||||
const nsAString &aText,
|
||||
PRInt32 attrCount,
|
||||
PRBool aNewlineRequired);
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
%{ C++
|
||||
#include "jsdebug.h"
|
||||
#include "nsAReadableString.h"
|
||||
#include "nsAString.h"
|
||||
%}
|
||||
|
||||
[ptr] native JSDContext(JSDContext);
|
||||
|
|
|
|||
|
|
@ -1761,7 +1761,7 @@ jsdStackFrame::GetThisValue(jsdIValue **_rval)
|
|||
|
||||
|
||||
NS_IMETHODIMP
|
||||
jsdStackFrame::Eval (const nsAReadableString &bytes, const char *fileName,
|
||||
jsdStackFrame::Eval (const nsAString &bytes, const char *fileName,
|
||||
PRUint32 line, jsdIValue **result, PRBool *_rval)
|
||||
{
|
||||
ASSERT_VALID_EPHEMERAL;
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@ XPCConvert::NativeData2JS(XPCCallContext& ccx, jsval* d, const void* s,
|
|||
|
||||
case nsXPTType::T_DOMSTRING:
|
||||
{
|
||||
const nsAReadableString* p = *((const nsAReadableString**)s);
|
||||
const nsAString* p = *((const nsAString**)s);
|
||||
if(!p)
|
||||
break;
|
||||
|
||||
|
|
@ -378,7 +378,7 @@ XPCConvert::NativeData2JS(XPCCallContext& ccx, jsval* d, const void* s,
|
|||
}
|
||||
case nsXPTType::T_UTF8STRING:
|
||||
{
|
||||
const nsAReadableCString* cString = *((const nsAReadableCString**)s);
|
||||
const nsACString* cString = *((const nsACString**)s);
|
||||
|
||||
if(!cString)
|
||||
break;
|
||||
|
|
@ -407,7 +407,7 @@ XPCConvert::NativeData2JS(XPCCallContext& ccx, jsval* d, const void* s,
|
|||
}
|
||||
case nsXPTType::T_CSTRING:
|
||||
{
|
||||
const nsAReadableCString* cString = *((const nsAReadableCString**)s);
|
||||
const nsACString* cString = *((const nsACString**)s);
|
||||
|
||||
if(!cString)
|
||||
break;
|
||||
|
|
@ -716,7 +716,7 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s,
|
|||
if(isNewString && ! wrapper->GetSharedBufferHandle())
|
||||
return JS_FALSE;
|
||||
|
||||
*((nsAReadableString**)d) = wrapper;
|
||||
*((const nsAString**)d) = wrapper;
|
||||
}
|
||||
else if(JSVAL_IS_NULL(s))
|
||||
{
|
||||
|
|
@ -725,19 +725,19 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s,
|
|||
if(!wrapper)
|
||||
return JS_FALSE;
|
||||
|
||||
*((nsAReadableString**)d) = wrapper;
|
||||
*((const nsAString**)d) = wrapper;
|
||||
}
|
||||
else
|
||||
{
|
||||
nsAReadableString *rs = new nsAutoString(chars, length);
|
||||
const nsAString *rs = new nsAutoString(chars, length);
|
||||
if(!rs)
|
||||
return JS_FALSE;
|
||||
*((nsAReadableString**)d) = rs;
|
||||
*((const nsAString**)d) = rs;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
nsAWritableString* ws = *((nsAWritableString**)d);
|
||||
nsAString* ws = *((nsAString**)d);
|
||||
|
||||
if(JSVAL_IS_NULL(s) || (!isDOMString && JSVAL_IS_VOID(s)))
|
||||
{
|
||||
|
|
@ -880,11 +880,11 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s,
|
|||
|
||||
if(useAllocator)
|
||||
{
|
||||
nsAReadableCString *rs = new NS_ConvertUCS2toUTF8((const PRUnichar*)chars, length);
|
||||
const nsACString *rs = new NS_ConvertUCS2toUTF8((const PRUnichar*)chars, length);
|
||||
if(!rs)
|
||||
return JS_FALSE;
|
||||
|
||||
*((nsAReadableCString**)d) = rs;
|
||||
*((const nsACString**)d) = rs;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -936,12 +936,12 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s,
|
|||
|
||||
if(useAllocator)
|
||||
{
|
||||
nsAReadableCString *rs = new nsCString(chars, length);
|
||||
const nsACString *rs = new nsCString(chars, length);
|
||||
|
||||
if(!rs)
|
||||
return JS_FALSE;
|
||||
|
||||
*((nsAReadableCString**)d) = rs;
|
||||
*((const nsACString**)d) = rs;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2253,7 +2253,7 @@ private:
|
|||
|
||||
/***************************************************************************/
|
||||
|
||||
// class to export a JSString as an nsAReadableString, including refcounting
|
||||
// class to export a JSString as an const nsAString, including refcounting
|
||||
class XPCReadableJSStringWrapper : public nsDependentString
|
||||
{
|
||||
public:
|
||||
|
|
@ -2359,7 +2359,7 @@ class XPCStringConvert
|
|||
public:
|
||||
|
||||
static JSString *ReadableToJSString(JSContext *cx,
|
||||
const nsAReadableString &readable);
|
||||
const nsAString &readable);
|
||||
|
||||
static XPCReadableJSStringWrapper *JSStringToReadable(JSString *str);
|
||||
|
||||
|
|
|
|||
|
|
@ -36,14 +36,14 @@
|
|||
/*
|
||||
* Infrastructure for sharing DOMString data with JSStrings.
|
||||
*
|
||||
* Importing an nsAReadableString into JS:
|
||||
* Importing an nsAString into JS:
|
||||
* If possible (GetSharedBufferHandle works) use the external string support in
|
||||
* JS to create a JSString that points to the readable's buffer. We keep a
|
||||
* reference to the buffer handle until the JSString is finalized.
|
||||
*
|
||||
* Exporting a JSString as an nsAReadable:
|
||||
* Wrap the JSString with a root-holding XPCJSReadableStringWrapper, which roots
|
||||
* the string and exposes its buffer via the nsAReadableString interface, as
|
||||
* the string and exposes its buffer via the nsAString interface, as
|
||||
* well as providing refcounting support.
|
||||
*/
|
||||
|
||||
|
|
@ -258,7 +258,7 @@ XPCStringConvert::ShutdownDOMStringFinalizer()
|
|||
// static
|
||||
JSString *
|
||||
XPCStringConvert::ReadableToJSString(JSContext *cx,
|
||||
const nsAReadableString &readable)
|
||||
const nsAString &readable)
|
||||
{
|
||||
const nsSharedBufferHandle<PRUnichar> *handle;
|
||||
handle = readable.GetSharedBufferHandle();
|
||||
|
|
|
|||
|
|
@ -692,13 +692,13 @@ NS_IMETHODIMP_(nsresult) XPCVariant::GetAsID(nsID *retval)
|
|||
}
|
||||
|
||||
/* AString getAsAString (); */
|
||||
NS_IMETHODIMP XPCVariant::GetAsAString(nsAWritableString & _retval)
|
||||
NS_IMETHODIMP XPCVariant::GetAsAString(nsAString & _retval)
|
||||
{
|
||||
return nsVariant::ConvertToAString(mData, _retval);
|
||||
}
|
||||
|
||||
/* DOMString getAsDOMString (); */
|
||||
NS_IMETHODIMP XPCVariant::GetAsDOMString(nsAWritableString & _retval)
|
||||
NS_IMETHODIMP XPCVariant::GetAsDOMString(nsAString & _retval)
|
||||
{
|
||||
// A DOMString maps to an AString internally, so we can re-use
|
||||
// ConvertToAString here.
|
||||
|
|
|
|||
|
|
@ -477,7 +477,7 @@ nsXPCWrappedJS::GetEnumerator(nsISimpleEnumerator * *aEnumerate)
|
|||
|
||||
/* nsIVariant getProperty (in AString name); */
|
||||
NS_IMETHODIMP
|
||||
nsXPCWrappedJS::GetProperty(const nsAReadableString & name, nsIVariant **_retval)
|
||||
nsXPCWrappedJS::GetProperty(const nsAString & name, nsIVariant **_retval)
|
||||
{
|
||||
XPCCallContext ccx(NATIVE_CALLER);
|
||||
if(!ccx.IsValid())
|
||||
|
|
|
|||
|
|
@ -397,7 +397,7 @@ xpcProperty::xpcProperty(const PRUnichar* aName, PRUint32 aNameLen,
|
|||
}
|
||||
|
||||
/* readonly attribute AString name; */
|
||||
NS_IMETHODIMP xpcProperty::GetName(nsAWritableString & aName)
|
||||
NS_IMETHODIMP xpcProperty::GetName(nsAString & aName)
|
||||
{
|
||||
aName.Assign(mName);
|
||||
return NS_OK;
|
||||
|
|
|
|||
|
|
@ -1800,7 +1800,7 @@ XPCWrappedNative::CallMethod(XPCCallContext& ccx,
|
|||
case nsXPTType::T_DOMSTRING:
|
||||
if(paramInfo.IsDipper())
|
||||
{
|
||||
// Is an 'out' DOMString. Make a new nsAWritableString
|
||||
// Is an 'out' DOMString. Make a new nsAString
|
||||
// now and then continue in order to skip the call to
|
||||
// JSData2Native
|
||||
|
||||
|
|
@ -1827,7 +1827,7 @@ XPCWrappedNative::CallMethod(XPCCallContext& ccx,
|
|||
|
||||
// Is an 'in' DOMString. Set 'useAllocator' to indicate
|
||||
// that JSData2Native should allocate a new
|
||||
// nsAReadableString.
|
||||
// nsAString.
|
||||
dp->SetValIsDOMString();
|
||||
useAllocator = JS_TRUE;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
#include "nsMemory.h"
|
||||
#include "nsIXPCSecurityManager.h"
|
||||
#include "nsICategoryManager.h"
|
||||
#include "nsAWritableString.h"
|
||||
#include "nsAString.h"
|
||||
#include "nsIVariant.h"
|
||||
|
||||
#include "jsapi.h"
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ xpcTestDOMString::~xpcTestDOMString()
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
xpcTestDOMString::HereHaveADOMString(const nsAReadableString &str)
|
||||
xpcTestDOMString::HereHaveADOMString(const nsAString &str)
|
||||
{
|
||||
const nsSharedBufferHandle<PRUnichar> *handle;
|
||||
handle = str.GetSharedBufferHandle();
|
||||
|
|
@ -79,7 +79,7 @@ xpcTestDOMString::HereHaveADOMString(const nsAReadableString &str)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
xpcTestDOMString::DontKeepThisOne(const nsAReadableString &str)
|
||||
xpcTestDOMString::DontKeepThisOne(const nsAString &str)
|
||||
{
|
||||
nsCString c; c.AssignWithConversion(str);
|
||||
fprintf(stderr, "xpcTestDOMString::DontKeepThisOne: \"%s\"\n", c.get());
|
||||
|
|
@ -94,7 +94,7 @@ xpcTestDOMString::GiveDOMStringTo(nsIXPCTestDOMString *recv)
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
xpcTestDOMString::PassDOMStringThroughTo(const nsAReadableString &str,
|
||||
xpcTestDOMString::PassDOMStringThroughTo(const nsAString &str,
|
||||
nsIXPCTestDOMString *recv)
|
||||
{
|
||||
return recv->HereHaveADOMString(str);
|
||||
|
|
|
|||
|
|
@ -107,15 +107,15 @@ NS_IMETHODIMP xpctestEcho::In2OutOneInt(int input, int* output)
|
|||
}
|
||||
|
||||
/* DOMString In2OutOneDOMString (in DOMString input); */
|
||||
NS_IMETHODIMP xpctestEcho::In2OutOneDOMString(const nsAReadableString & input,
|
||||
nsAWritableString & _retval)
|
||||
NS_IMETHODIMP xpctestEcho::In2OutOneDOMString(const nsAString & input,
|
||||
nsAString & _retval)
|
||||
{
|
||||
_retval.Assign(input);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/* DOMString EchoIn2OutOneDOMString (in DOMString input); */
|
||||
NS_IMETHODIMP xpctestEcho::EchoIn2OutOneDOMString(const nsAReadableString & input, nsAWritableString & _retval)
|
||||
NS_IMETHODIMP xpctestEcho::EchoIn2OutOneDOMString(const nsAString & input, nsAString & _retval)
|
||||
{
|
||||
if(mReceiver)
|
||||
return mReceiver->EchoIn2OutOneDOMString(input, _retval);
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
#include "nsIGenericFactory.h"
|
||||
#include "nscore.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsAWritableString.h"
|
||||
#include "nsAString.h"
|
||||
#include "nsVariant.h"
|
||||
#include <stdio.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ NS_IMETHODIMP nsTestVariant::CopyVariantAsTypeTwice(nsIVariant *value, PRUint16
|
|||
}
|
||||
|
||||
/* nsIVariant getNamedProperty (in nsISupports aBag, in AString aName); */
|
||||
NS_IMETHODIMP nsTestVariant::GetNamedProperty(nsISupports *aObj, const nsAReadableString & aName, nsIVariant **_retval)
|
||||
NS_IMETHODIMP nsTestVariant::GetNamedProperty(nsISupports *aObj, const nsAString & aName, nsIVariant **_retval)
|
||||
{
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsIPropertyBag> bag = do_QueryInterface(aObj, &rv);
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#ifndef nsHTMLTags_h___
|
||||
#define nsHTMLTags_h___
|
||||
|
||||
#include "nsAReadableString.h"
|
||||
#include "nsAString.h"
|
||||
|
||||
/*
|
||||
Declare the enum list using the magic of preprocessing
|
||||
|
|
@ -70,7 +70,7 @@ public:
|
|||
static nsresult AddRefTable(void);
|
||||
static void ReleaseTable(void);
|
||||
|
||||
static nsHTMLTag LookupTag(const nsAReadableString& aTagName);
|
||||
static nsHTMLTag LookupTag(const nsAString& aTagName);
|
||||
static nsHTMLTag CaseSensitiveLookupTag(const PRUnichar* aTagName);
|
||||
static const PRUnichar *GetStringValue(nsHTMLTag aEnum);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -118,8 +118,8 @@ class CStartToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CStartToken(eHTMLTags aTag=eHTMLTag_unknown);
|
||||
CStartToken(const nsAReadableString& aString);
|
||||
CStartToken(const nsAReadableString& aName,eHTMLTags aTag);
|
||||
CStartToken(const nsAString& aString);
|
||||
CStartToken(const nsAString& aName,eHTMLTags aTag);
|
||||
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual PRInt32 GetTypeID(void);
|
||||
|
|
@ -131,7 +131,7 @@ class CStartToken: public CHTMLToken {
|
|||
#ifdef DEBUG
|
||||
virtual void DebugDumpSource(nsOutputStream& out);
|
||||
#endif
|
||||
virtual const nsAReadableString& GetStringValue();
|
||||
virtual const nsAString& GetStringValue();
|
||||
virtual void GetSource(nsString& anOutputString);
|
||||
virtual void AppendSource(nsString& anOutputString);
|
||||
|
||||
|
|
@ -174,8 +174,8 @@ class CEndToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CEndToken(eHTMLTags aTag);
|
||||
CEndToken(const nsAReadableString& aString);
|
||||
CEndToken(const nsAReadableString& aName,eHTMLTags aTag);
|
||||
CEndToken(const nsAString& aString);
|
||||
CEndToken(const nsAString& aName,eHTMLTags aTag);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual PRInt32 GetTypeID(void);
|
||||
virtual const char* GetClassName(void);
|
||||
|
|
@ -183,7 +183,7 @@ class CEndToken: public CHTMLToken {
|
|||
#ifdef DEBUG
|
||||
virtual void DebugDumpSource(nsOutputStream& out);
|
||||
#endif
|
||||
virtual const nsAReadableString& GetStringValue();
|
||||
virtual const nsAString& GetStringValue();
|
||||
virtual void GetSource(nsString& anOutputString);
|
||||
virtual void AppendSource(nsString& anOutputString);
|
||||
|
||||
|
|
@ -205,11 +205,11 @@ class CCommentToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CCommentToken();
|
||||
CCommentToken(const nsAReadableString& aString);
|
||||
CCommentToken(const nsAString& aString);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
char mLeadingChar;
|
||||
|
||||
protected:
|
||||
|
|
@ -229,7 +229,7 @@ class CEntityToken : public CHTMLToken {
|
|||
|
||||
public:
|
||||
CEntityToken();
|
||||
CEntityToken(const nsAReadableString& aString);
|
||||
CEntityToken(const nsAString& aString);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
PRInt32 TranslateToUnicodeStr(nsString& aString);
|
||||
|
|
@ -239,7 +239,7 @@ class CEntityToken : public CHTMLToken {
|
|||
#ifdef DEBUG
|
||||
virtual void DebugDumpSource(nsOutputStream& out);
|
||||
#endif
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
virtual void GetSource(nsString& anOutputString);
|
||||
virtual void AppendSource(nsString& anOutputString);
|
||||
|
||||
|
|
@ -260,11 +260,11 @@ class CWhitespaceToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CWhitespaceToken();
|
||||
CWhitespaceToken(const nsAReadableString& aString);
|
||||
CWhitespaceToken(const nsAString& aString);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
|
|
@ -282,17 +282,17 @@ class CTextToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CTextToken();
|
||||
CTextToken(const nsAReadableString& aString);
|
||||
CTextToken(const nsAString& aString);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
nsresult ConsumeUntil(PRUnichar aChar,PRBool aIgnoreComments,nsScanner& aScanner,
|
||||
nsString& aEndTagName,PRInt32 aMode,PRBool& aFlushTokens);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual PRInt32 GetTextLength(void);
|
||||
virtual void CopyTo(nsAWritableString& aStr);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual void CopyTo(nsAString& aStr);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
virtual void Bind(nsScanner* aScanner, nsReadingIterator<PRUnichar>& aStart, nsReadingIterator<PRUnichar>& aEnd);
|
||||
virtual void Bind(const nsAReadableString& aStr);
|
||||
virtual void Bind(const nsAString& aStr);
|
||||
|
||||
protected:
|
||||
nsSlidingSubstring mTextValue;
|
||||
|
|
@ -311,11 +311,11 @@ class CCDATASectionToken : public CHTMLToken {
|
|||
|
||||
public:
|
||||
CCDATASectionToken();
|
||||
CCDATASectionToken(const nsAReadableString& aString);
|
||||
CCDATASectionToken(const nsAString& aString);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
|
|
@ -333,11 +333,11 @@ class CMarkupDeclToken : public CHTMLToken {
|
|||
|
||||
public:
|
||||
CMarkupDeclToken();
|
||||
CMarkupDeclToken(const nsAReadableString& aString);
|
||||
CMarkupDeclToken(const nsAString& aString);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
protected:
|
||||
nsSlidingSubstring mTextValue;
|
||||
|
|
@ -357,21 +357,21 @@ class CAttributeToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CAttributeToken();
|
||||
CAttributeToken(const nsAReadableString& aString);
|
||||
CAttributeToken(const nsAReadableString& aKey, const nsAReadableString& aString);
|
||||
CAttributeToken(const nsAString& aString);
|
||||
CAttributeToken(const nsAString& aKey, const nsAString& aString);
|
||||
~CAttributeToken() {}
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetKey(void) {return mTextKey;}
|
||||
virtual void SetKey(const nsAReadableString& aKey);
|
||||
virtual const nsAString& GetKey(void) {return mTextKey;}
|
||||
virtual void SetKey(const nsAString& aKey);
|
||||
virtual void BindKey(nsScanner* aScanner, nsReadingIterator<PRUnichar>& aStart, nsReadingIterator<PRUnichar>& aEnd);
|
||||
virtual const nsAString& GetValue(void) {return mTextValue;}
|
||||
virtual void SanitizeKey();
|
||||
#ifdef DEBUG
|
||||
virtual void DebugDumpToken(nsOutputStream& out);
|
||||
#endif
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
virtual void GetSource(nsString& anOutputString);
|
||||
virtual void AppendSource(nsString& anOutputString);
|
||||
#ifdef DEBUG
|
||||
|
|
@ -402,7 +402,7 @@ class CNewlineToken: public CHTMLToken {
|
|||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
static void AllocNewline();
|
||||
static void FreeNewline();
|
||||
|
|
@ -423,10 +423,10 @@ class CScriptToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CScriptToken();
|
||||
CScriptToken(const nsAReadableString& aString);
|
||||
CScriptToken(const nsAString& aString);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
|
|
@ -446,10 +446,10 @@ class CStyleToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CStyleToken();
|
||||
CStyleToken(const nsAReadableString& aString);
|
||||
CStyleToken(const nsAString& aString);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
|
|
@ -468,11 +468,11 @@ class CInstructionToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CInstructionToken();
|
||||
CInstructionToken(const nsAReadableString& aString);
|
||||
CInstructionToken(const nsAString& aString);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
|
|
@ -494,7 +494,7 @@ public:
|
|||
// of nsParserError is returned which needs to be destroyed by the consumer?
|
||||
const nsParserError* GetError(void);
|
||||
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
nsParserError* mError;
|
||||
|
|
@ -511,12 +511,12 @@ class CDoctypeDeclToken: public CHTMLToken {
|
|||
|
||||
public:
|
||||
CDoctypeDeclToken(eHTMLTags aTag=eHTMLTag_unknown);
|
||||
CDoctypeDeclToken(const nsAReadableString& aString,eHTMLTags aTag=eHTMLTag_unknown);
|
||||
CDoctypeDeclToken(const nsAString& aString,eHTMLTags aTag=eHTMLTag_unknown);
|
||||
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode);
|
||||
virtual const char* GetClassName(void);
|
||||
virtual PRInt32 GetTokenType(void);
|
||||
virtual const nsAReadableString& GetStringValue(void);
|
||||
virtual void SetStringValue(const nsAReadableString& aStr);
|
||||
virtual const nsAString& GetStringValue(void);
|
||||
virtual void SetStringValue(const nsAString& aStr);
|
||||
|
||||
protected:
|
||||
nsString mTextValue;
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ public:
|
|||
* Set the document character set. This should be passed on to the
|
||||
* document itself.
|
||||
*/
|
||||
NS_IMETHOD SetDocumentCharset(nsAWritableString& aCharset)=0;
|
||||
NS_IMETHOD SetDocumentCharset(nsAString& aCharset)=0;
|
||||
};
|
||||
|
||||
#endif /* nsIContentSink_h___ */
|
||||
|
|
|
|||
|
|
@ -216,12 +216,12 @@ public:
|
|||
* Give rest of world access to our tag enums, so that CanContain(), etc,
|
||||
* become useful.
|
||||
*/
|
||||
NS_IMETHOD StringTagToIntTag(const nsAReadableString &aTag,
|
||||
NS_IMETHOD StringTagToIntTag(const nsAString &aTag,
|
||||
PRInt32* aIntTag) const = 0;
|
||||
|
||||
NS_IMETHOD_(const PRUnichar *) IntTagToStringTag(PRInt32 aIntTag) const = 0;
|
||||
|
||||
NS_IMETHOD ConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
NS_IMETHOD ConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const = 0;
|
||||
|
||||
NS_IMETHOD_(PRBool) IsBlockElement(PRInt32 aTagID,
|
||||
|
|
@ -245,9 +245,9 @@ public:
|
|||
NS_IMETHOD_(PRBool) CanContain(PRInt32 aParent,PRInt32 aChild) const;\
|
||||
NS_IMETHOD_(PRBool) IsContainer(PRInt32 aTag) const;\
|
||||
NS_IMETHOD_(void) Terminate();\
|
||||
NS_IMETHOD StringTagToIntTag(const nsAReadableString &aTag, PRInt32* aIntTag) const ;\
|
||||
NS_IMETHOD StringTagToIntTag(const nsAString &aTag, PRInt32* aIntTag) const ;\
|
||||
NS_IMETHOD_(const PRUnichar *) IntTagToStringTag(PRInt32 aIntTag) const ;\
|
||||
NS_IMETHOD ConvertEntityToUnicode(const nsAReadableString& aEntity, PRInt32* aUnicode) const ;\
|
||||
NS_IMETHOD ConvertEntityToUnicode(const nsAString& aEntity, PRInt32* aUnicode) const ;\
|
||||
NS_IMETHOD_(PRBool) IsBlockElement(PRInt32 aTagID,PRInt32 aParentID) const;\
|
||||
NS_IMETHOD_(PRBool) IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const;
|
||||
#endif /* nsIDTD_h___ */
|
||||
|
|
|
|||
|
|
@ -231,11 +231,11 @@ class nsIParser : public nsISupports {
|
|||
|
||||
virtual nsresult Parse(nsIURI* aURL,nsIRequestObserver* aListener = nsnull,PRBool aEnableVerify=PR_FALSE, void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect) = 0;
|
||||
virtual nsresult Parse(nsIInputStream& aStream, const nsACString& aMimeType,PRBool aEnableVerify=PR_FALSE, void* aKey=0,nsDTDMode aMode=eDTDMode_autodetect) = 0;
|
||||
virtual nsresult Parse(const nsAReadableString& aSourceBuffer,void* aKey,const nsACString& aMimeType,PRBool aEnableVerify,PRBool aLastCall,nsDTDMode aMode=eDTDMode_autodetect) = 0;
|
||||
virtual nsresult Parse(const nsAString& aSourceBuffer,void* aKey,const nsACString& aMimeType,PRBool aEnableVerify,PRBool aLastCall,nsDTDMode aMode=eDTDMode_autodetect) = 0;
|
||||
|
||||
virtual nsresult Terminate(void) = 0;
|
||||
|
||||
virtual nsresult ParseFragment(const nsAReadableString& aSourceBuffer,
|
||||
virtual nsresult ParseFragment(const nsAString& aSourceBuffer,
|
||||
void* aKey,
|
||||
nsVoidArray& aTagStack,
|
||||
PRUint32 anInsertPos,
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ class nsIParserNode { // XXX Should be nsAParserNode
|
|||
* @update gess5/11/98
|
||||
* @return string containing node text
|
||||
*/
|
||||
virtual const nsAReadableString& GetText() const =0; //get plain text if available
|
||||
virtual const nsAString& GetText() const =0; //get plain text if available
|
||||
|
||||
/**
|
||||
* Retrieve skipped context from node
|
||||
|
|
@ -133,7 +133,7 @@ class nsIParserNode { // XXX Should be nsAParserNode
|
|||
* @param anIndex is the index of the key you want
|
||||
* @return string containing key.
|
||||
*/
|
||||
virtual const nsAReadableString& GetKeyAt(PRUint32 anIndex) const =0;
|
||||
virtual const nsAString& GetKeyAt(PRUint32 anIndex) const =0;
|
||||
|
||||
/**
|
||||
* Retrieve the value (of key/value pair) at given index
|
||||
|
|
|
|||
|
|
@ -76,13 +76,13 @@ class nsIParserService : public nsISupports {
|
|||
NS_IMETHOD HTMLCaseSensitiveAtomTagToId(nsIAtom* aAtom,
|
||||
PRInt32* aId) const = 0;
|
||||
|
||||
NS_IMETHOD HTMLStringTagToId(const nsAReadableString &aTagName,
|
||||
NS_IMETHOD HTMLStringTagToId(const nsAString &aTagName,
|
||||
PRInt32* aId) const = 0;
|
||||
|
||||
NS_IMETHOD HTMLIdToStringTag(PRInt32 aId,
|
||||
const PRUnichar **aTagName) const = 0;
|
||||
|
||||
NS_IMETHOD HTMLConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
NS_IMETHOD HTMLConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const = 0;
|
||||
|
||||
NS_IMETHOD HTMLConvertUnicodeToEntity(PRInt32 aUnicode,
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ class CToken {
|
|||
* @update gess5/11/98
|
||||
* @return reference to string containing string value
|
||||
*/
|
||||
virtual const nsAReadableString& GetStringValue(void) = 0;
|
||||
virtual const nsAString& GetStringValue(void) = 0;
|
||||
|
||||
/**
|
||||
* Get string of full contents, suitable for debug dump.
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ public:
|
|||
NS_IMETHOD WillResume(void) { return NS_OK; }
|
||||
NS_IMETHOD SetParser(nsIParser* aParser) { return NS_OK; }
|
||||
NS_IMETHOD FlushPendingNotifications() { return NS_OK; }
|
||||
NS_IMETHOD SetDocumentCharset(nsAWritableString& aCharset) { return NS_OK; }
|
||||
NS_IMETHOD SetDocumentCharset(nsAString& aCharset) { return NS_OK; }
|
||||
NS_IMETHOD WillProcessTokens(void) { return NS_OK; }
|
||||
NS_IMETHOD DidProcessTokens(void) { return NS_OK; }
|
||||
NS_IMETHOD WillProcessAToken(void) { return NS_OK; }
|
||||
|
|
@ -249,7 +249,7 @@ NS_IMETHODIMP RobotSink::OpenContainer(const nsIParserNode& aNode)
|
|||
PRInt32 ac = aNode.GetAttributeCount();
|
||||
for (PRInt32 i = 0; i < ac; i++) {
|
||||
// Get upper-cased key
|
||||
const nsAReadableString& key = aNode.GetKeyAt(i);
|
||||
const nsAString& key = aNode.GetKeyAt(i);
|
||||
k.Assign(key);
|
||||
ToLowerCase(k);
|
||||
if (k.Equals(NS_LITERAL_STRING("href"))) {
|
||||
|
|
|
|||
|
|
@ -697,8 +697,8 @@ PRBool DoesRequireBody(CToken* aToken,nsITokenizer* aTokenizer) {
|
|||
PRInt32 ac=aToken->GetAttributeCount();
|
||||
for(PRInt32 i=0; i<ac; i++) {
|
||||
CAttributeToken* attr=NS_STATIC_CAST(CAttributeToken*,aTokenizer->GetTokenAt(i));
|
||||
const nsAReadableString& name=attr->GetKey();
|
||||
const nsAReadableString& value=attr->GetValue();
|
||||
const nsAString& name=attr->GetKey();
|
||||
const nsAString& value=attr->GetValue();
|
||||
|
||||
if((name.Equals(NS_LITERAL_STRING("type")) ||
|
||||
name.Equals(NS_LITERAL_STRING("TYPE")))
|
||||
|
|
@ -2188,7 +2188,7 @@ nsresult CNavDTD::HandleCommentToken(CToken* aToken) {
|
|||
nsresult result=NS_OK;
|
||||
|
||||
CCommentToken* theToken = NS_STATIC_CAST(CCommentToken*,aToken);
|
||||
const nsAReadableString& theComment = theToken->GetStringValue();
|
||||
const nsAString& theComment = theToken->GetStringValue();
|
||||
mLineNumber += CountCharInReadable(theComment, PRUnichar(kNewLine));
|
||||
|
||||
nsCParserNode* theNode=mNodeAllocator.CreateNode(aToken,mLineNumber,mTokenAllocator);
|
||||
|
|
@ -2533,7 +2533,7 @@ PRBool CNavDTD::CanContain(PRInt32 aParent,PRInt32 aChild) const {
|
|||
* Give rest of world access to our tag enums, so that CanContain(), etc,
|
||||
* become useful.
|
||||
*/
|
||||
NS_IMETHODIMP CNavDTD::StringTagToIntTag(const nsAReadableString &aTag,
|
||||
NS_IMETHODIMP CNavDTD::StringTagToIntTag(const nsAString &aTag,
|
||||
PRInt32* aIntTag) const
|
||||
{
|
||||
*aIntTag = nsHTMLTags::LookupTag(aTag);
|
||||
|
|
@ -2553,7 +2553,7 @@ CNavDTD::IntTagToStringTag(PRInt32 aIntTag) const
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
CNavDTD::ConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
CNavDTD::ConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const
|
||||
{
|
||||
*aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
|
||||
|
|
|
|||
|
|
@ -903,7 +903,7 @@ PRBool COtherDTD::CanContain(PRInt32 aParent,PRInt32 aChild) const {
|
|||
* become useful.
|
||||
*/
|
||||
NS_IMETHODIMP
|
||||
COtherDTD::StringTagToIntTag(const nsAReadableString &aTag,
|
||||
COtherDTD::StringTagToIntTag(const nsAString &aTag,
|
||||
PRInt32* aIntTag) const
|
||||
{
|
||||
*aIntTag = nsHTMLTags::LookupTag(aTag);
|
||||
|
|
@ -923,7 +923,7 @@ COtherDTD::IntTagToStringTag(PRInt32 aIntTag) const
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
COtherDTD::ConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
COtherDTD::ConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const
|
||||
{
|
||||
*aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
|
||||
|
|
|
|||
|
|
@ -1240,7 +1240,7 @@ public:
|
|||
*
|
||||
* @return ptr to new token (or 0).
|
||||
*/
|
||||
CToken* nsTokenAllocator::CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag, const nsAReadableString& aString) {
|
||||
CToken* nsTokenAllocator::CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag, const nsAString& aString) {
|
||||
|
||||
CToken* result=0;
|
||||
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ public:
|
|||
|
||||
nsTokenAllocator();
|
||||
virtual ~nsTokenAllocator();
|
||||
virtual CToken* CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag, const nsAReadableString& aString);
|
||||
virtual CToken* CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag, const nsAString& aString);
|
||||
virtual CToken* CreateTokenOfType(eHTMLTokenTypes aType,eHTMLTags aTag);
|
||||
|
||||
nsFixedSizeAllocator& GetArenaPool() { return mArenaPool; }
|
||||
|
|
@ -498,7 +498,7 @@ inline PRBool BufferContainsHTML(const nsString& aBuffer,
|
|||
PRInt32 theCount = 0;
|
||||
PRInt32 theTagCount = 0;
|
||||
|
||||
nsAReadableString::const_iterator iter, end;
|
||||
nsAString::const_iterator iter, end;
|
||||
aBuffer.BeginReading(iter);
|
||||
aBuffer.EndReading(end);
|
||||
|
||||
|
|
@ -516,7 +516,7 @@ inline PRBool BufferContainsHTML(const nsString& aBuffer,
|
|||
|
||||
++iter; // step over the '<' character
|
||||
|
||||
nsAReadableString::const_iterator tag_end(iter);
|
||||
nsAString::const_iterator tag_end(iter);
|
||||
|
||||
aBuffer.EndReading(end);
|
||||
|
||||
|
|
|
|||
|
|
@ -1007,7 +1007,7 @@ nsExpatDriver::CanContain(PRInt32 aParent,PRInt32 aChild) const
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsExpatDriver::StringTagToIntTag(const nsAReadableString &aTag, PRInt32* aIntTag) const
|
||||
nsExpatDriver::StringTagToIntTag(const nsAString &aTag, PRInt32* aIntTag) const
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -1019,7 +1019,7 @@ nsExpatDriver::IntTagToStringTag(PRInt32 aIntTag) const
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsExpatDriver::ConvertEntityToUnicode(const nsAReadableString& aEntity, PRInt32* aUnicode) const
|
||||
nsExpatDriver::ConvertEntityToUnicode(const nsAString& aEntity, PRInt32* aUnicode) const
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ nsHTMLEntities::EntityToUnicode(const nsCString& aEntity)
|
|||
|
||||
|
||||
PRInt32
|
||||
nsHTMLEntities::EntityToUnicode(const nsAReadableString& aEntity) {
|
||||
nsHTMLEntities::EntityToUnicode(const nsAString& aEntity) {
|
||||
nsCAutoString theEntity; theEntity.AssignWithConversion(aEntity);
|
||||
if(';'==theEntity.Last()) {
|
||||
theEntity.Truncate(theEntity.Length()-1);
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ public:
|
|||
* passed in must NOT have the leading "&" nor the trailing ";"
|
||||
* in it.
|
||||
*/
|
||||
static PRInt32 EntityToUnicode(const nsAReadableString& aEntity);
|
||||
static PRInt32 EntityToUnicode(const nsAString& aEntity);
|
||||
static PRInt32 EntityToUnicode(const nsCString& aEntity);
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ public:
|
|||
NS_IMETHOD AddComment(const nsIParserNode& aNode);
|
||||
NS_IMETHOD AddDocTypeDecl(const nsIParserNode& aNode, PRInt32 aMode=0);
|
||||
NS_IMETHOD FlushPendingNotifications() {return NS_OK; }
|
||||
NS_IMETHOD SetDocumentCharset(nsAWritableString& aCharset) {return NS_OK;}
|
||||
NS_IMETHOD SetDocumentCharset(nsAString& aCharset) {return NS_OK;}
|
||||
NS_IMETHOD NotifyTagObservers(nsIParserNode* aNode) { return NS_OK; }
|
||||
|
||||
// nsIHTMLContentSink
|
||||
|
|
@ -149,7 +149,7 @@ nsHTMLNullSink::~nsHTMLNullSink() {
|
|||
}
|
||||
|
||||
#ifdef VERBOSE_DEBUG
|
||||
static void DebugDump(const char* str1,const nsAReadableString& str2,PRInt32 tabs) {
|
||||
static void DebugDump(const char* str1,const nsAString& str2,PRInt32 tabs) {
|
||||
for(PRInt32 i=0;i<tabs;i++) {
|
||||
PR_fprintf(PR_STDOUT, " "); //add some tabbing to debug output...
|
||||
}
|
||||
|
|
|
|||
|
|
@ -399,7 +399,7 @@ nsHTMLTags::CaseSensitiveLookupTag(const PRUnichar* aTagName)
|
|||
|
||||
// static
|
||||
nsHTMLTag
|
||||
nsHTMLTags::LookupTag(const nsAReadableString& aTagName)
|
||||
nsHTMLTags::LookupTag(const nsAString& aTagName)
|
||||
{
|
||||
PRUint32 length = aTagName.Length();
|
||||
|
||||
|
|
@ -409,7 +409,7 @@ nsHTMLTags::LookupTag(const nsAReadableString& aTagName)
|
|||
|
||||
static PRUnichar buf[NS_HTMLTAG_NAME_MAX_LENGTH + 1];
|
||||
|
||||
nsAReadableString::const_iterator iter;
|
||||
nsAString::const_iterator iter;
|
||||
PRUint32 i = 0;
|
||||
PRUnichar c;
|
||||
|
||||
|
|
|
|||
|
|
@ -626,8 +626,8 @@ nsresult nsHTMLTokenizer::ConsumeAttributes(PRUnichar aChar,CStartToken* aToken,
|
|||
//start token it was empty.
|
||||
if(NS_SUCCEEDED(result)) {
|
||||
PRBool isUsableAttr = PR_TRUE;
|
||||
const nsAReadableString& key=theToken->GetKey();
|
||||
const nsAReadableString& text=theToken->GetValue();
|
||||
const nsAString& key=theToken->GetKey();
|
||||
const nsAString& text=theToken->GetValue();
|
||||
// support XML like syntax to fix bugs like 44186
|
||||
if(!key.IsEmpty() && kForwardSlash==key.First() && text.IsEmpty()) {
|
||||
isUsableAttr = PRBool(mFlags & NS_IPARSER_FLAG_VIEW_SOURCE); // Fix bug 103095
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ CStartToken::CStartToken(eHTMLTags aTag) : CHTMLToken(aTag) {
|
|||
#endif
|
||||
}
|
||||
|
||||
CStartToken::CStartToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
CStartToken::CStartToken(const nsAString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
mEmpty=PR_FALSE;
|
||||
mContainerInfo=eFormUnknown;
|
||||
mTextValue.Assign(aName);
|
||||
|
|
@ -106,7 +106,7 @@ CStartToken::CStartToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_u
|
|||
#endif
|
||||
}
|
||||
|
||||
CStartToken::CStartToken(const nsAReadableString& aName,eHTMLTags aTag) : CHTMLToken(aTag) {
|
||||
CStartToken::CStartToken(const nsAString& aName,eHTMLTags aTag) : CHTMLToken(aTag) {
|
||||
mEmpty=PR_FALSE;
|
||||
mContainerInfo=eFormUnknown;
|
||||
mTextValue.Assign(aName);
|
||||
|
|
@ -246,7 +246,7 @@ void CStartToken::DebugDumpSource(nsOutputStream& out) {
|
|||
}
|
||||
#endif
|
||||
|
||||
const nsAReadableString& CStartToken::GetStringValue()
|
||||
const nsAString& CStartToken::GetStringValue()
|
||||
{
|
||||
if((eHTMLTag_unknown<mTypeID) && (mTypeID<eHTMLTag_text)) {
|
||||
if(!mTextValue.Length()) {
|
||||
|
|
@ -312,11 +312,11 @@ void CStartToken::AppendSource(nsString& anOutputString){
|
|||
CEndToken::CEndToken(eHTMLTags aTag) : CHTMLToken(aTag) {
|
||||
}
|
||||
|
||||
CEndToken::CEndToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
CEndToken::CEndToken(const nsAString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
mTextValue.Assign(aName);
|
||||
}
|
||||
|
||||
CEndToken::CEndToken(const nsAReadableString& aName,eHTMLTags aTag) : CHTMLToken(aTag) {
|
||||
CEndToken::CEndToken(const nsAString& aName,eHTMLTags aTag) : CHTMLToken(aTag) {
|
||||
mTextValue.Assign(aName);
|
||||
}
|
||||
|
||||
|
|
@ -433,7 +433,7 @@ void CEndToken::DebugDumpSource(nsOutputStream& out) {
|
|||
}
|
||||
#endif
|
||||
|
||||
const nsAReadableString& CEndToken::GetStringValue()
|
||||
const nsAString& CEndToken::GetStringValue()
|
||||
{
|
||||
if((eHTMLTag_unknown<mTypeID) && (mTypeID<eHTMLTag_text)) {
|
||||
if(!mTextValue.Length()) {
|
||||
|
|
@ -493,7 +493,7 @@ CTextToken::CTextToken() : CHTMLToken(eHTMLTag_text) {
|
|||
* @param aName -- string to init token name with
|
||||
* @return
|
||||
*/
|
||||
CTextToken::CTextToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_text) {
|
||||
CTextToken::CTextToken(const nsAString& aName) : CHTMLToken(eHTMLTag_text) {
|
||||
mTextValue.Rebind(aName);
|
||||
}
|
||||
|
||||
|
|
@ -719,12 +719,12 @@ nsresult CTextToken::ConsumeUntil(PRUnichar aChar,PRBool aIgnoreComments,nsScann
|
|||
return result;
|
||||
}
|
||||
|
||||
void CTextToken::CopyTo(nsAWritableString& aStr)
|
||||
void CTextToken::CopyTo(nsAString& aStr)
|
||||
{
|
||||
aStr.Assign(mTextValue);
|
||||
}
|
||||
|
||||
const nsAReadableString& CTextToken::GetStringValue(void)
|
||||
const nsAString& CTextToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -734,7 +734,7 @@ void CTextToken::Bind(nsScanner* aScanner, nsReadingIterator<PRUnichar>& aStart,
|
|||
aScanner->BindSubstring(mTextValue, aStart, aEnd);
|
||||
}
|
||||
|
||||
void CTextToken::Bind(const nsAReadableString& aStr)
|
||||
void CTextToken::Bind(const nsAString& aStr)
|
||||
{
|
||||
mTextValue.Rebind(aStr);
|
||||
}
|
||||
|
|
@ -757,7 +757,7 @@ CCDATASectionToken::CCDATASectionToken() : CHTMLToken(eHTMLTag_unknown) {
|
|||
* @param aName -- string to init token name with
|
||||
* @return
|
||||
*/
|
||||
CCDATASectionToken::CCDATASectionToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
CCDATASectionToken::CCDATASectionToken(const nsAString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
mTextValue.Assign(aName);
|
||||
}
|
||||
|
||||
|
|
@ -841,7 +841,7 @@ nsresult CCDATASectionToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt3
|
|||
return result;
|
||||
}
|
||||
|
||||
const nsAReadableString& CCDATASectionToken::GetStringValue(void)
|
||||
const nsAString& CCDATASectionToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -863,7 +863,7 @@ CMarkupDeclToken::CMarkupDeclToken() : CHTMLToken(eHTMLTag_markupDecl) {
|
|||
* @param aName -- string to init token name with
|
||||
* @return
|
||||
*/
|
||||
CMarkupDeclToken::CMarkupDeclToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_markupDecl) {
|
||||
CMarkupDeclToken::CMarkupDeclToken(const nsAString& aName) : CHTMLToken(eHTMLTag_markupDecl) {
|
||||
mTextValue.Rebind(aName);
|
||||
}
|
||||
|
||||
|
|
@ -978,7 +978,7 @@ nsresult CMarkupDeclToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32
|
|||
return result;
|
||||
}
|
||||
|
||||
const nsAReadableString& CMarkupDeclToken::GetStringValue(void)
|
||||
const nsAString& CMarkupDeclToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -1002,7 +1002,7 @@ CCommentToken::CCommentToken() : CHTMLToken(eHTMLTag_comment) {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
CCommentToken::CCommentToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_comment) {
|
||||
CCommentToken::CCommentToken(const nsAString& aName) : CHTMLToken(eHTMLTag_comment) {
|
||||
mTextValue.Assign(aName);
|
||||
}
|
||||
|
||||
|
|
@ -1270,7 +1270,7 @@ nsresult CCommentToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aFl
|
|||
return result;
|
||||
}
|
||||
|
||||
const nsAReadableString& CCommentToken::GetStringValue(void)
|
||||
const nsAString& CCommentToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -1351,7 +1351,7 @@ void CNewlineToken::FreeNewline()
|
|||
* @update gess 3/25/98
|
||||
* @return nsString reference to internal string value
|
||||
*/
|
||||
const nsAReadableString& CNewlineToken::GetStringValue(void) {
|
||||
const nsAString& CNewlineToken::GetStringValue(void) {
|
||||
return *gNewlineStr;
|
||||
}
|
||||
|
||||
|
|
@ -1419,7 +1419,7 @@ CAttributeToken::CAttributeToken() : CHTMLToken(eHTMLTag_unknown) {
|
|||
* @param aName -- string value to init token name with
|
||||
* @return
|
||||
*/
|
||||
CAttributeToken::CAttributeToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
CAttributeToken::CAttributeToken(const nsAString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
mTextValue.Assign(aName);
|
||||
mHasEqualWithoutValue=PR_FALSE;
|
||||
#ifdef DEBUG
|
||||
|
|
@ -1435,7 +1435,7 @@ CAttributeToken::CAttributeToken(const nsAReadableString& aName) : CHTMLToken(eH
|
|||
* @param aName -- string value to init token name with
|
||||
* @return
|
||||
*/
|
||||
CAttributeToken::CAttributeToken(const nsAReadableString& aKey, const nsAReadableString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
CAttributeToken::CAttributeToken(const nsAString& aKey, const nsAString& aName) : CHTMLToken(eHTMLTag_unknown) {
|
||||
mTextValue.Assign(aName);
|
||||
mTextKey.Rebind(aKey);
|
||||
mHasEqualWithoutValue=PR_FALSE;
|
||||
|
|
@ -1517,7 +1517,7 @@ void CAttributeToken::DebugDumpToken(nsOutputStream& out) {
|
|||
}
|
||||
#endif
|
||||
|
||||
const nsAReadableString& CAttributeToken::GetStringValue(void)
|
||||
const nsAString& CAttributeToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -1859,7 +1859,7 @@ void CAttributeToken::DebugDumpSource(nsOutputStream& out) {
|
|||
}
|
||||
#endif
|
||||
|
||||
void CAttributeToken::SetKey(const nsAReadableString& aKey)
|
||||
void CAttributeToken::SetKey(const nsAString& aKey)
|
||||
{
|
||||
mTextKey.Rebind(aKey);
|
||||
}
|
||||
|
|
@ -1889,7 +1889,7 @@ CWhitespaceToken::CWhitespaceToken() : CHTMLToken(eHTMLTag_whitespace) {
|
|||
* @param aName -- string value to init token name with
|
||||
* @return
|
||||
*/
|
||||
CWhitespaceToken::CWhitespaceToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_whitespace) {
|
||||
CWhitespaceToken::CWhitespaceToken(const nsAString& aName) : CHTMLToken(eHTMLTag_whitespace) {
|
||||
mTextValue.Assign(aName);
|
||||
}
|
||||
|
||||
|
|
@ -1933,7 +1933,7 @@ nsresult CWhitespaceToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32
|
|||
return result;
|
||||
}
|
||||
|
||||
const nsAReadableString& CWhitespaceToken::GetStringValue(void)
|
||||
const nsAString& CWhitespaceToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -1955,7 +1955,7 @@ CEntityToken::CEntityToken() : CHTMLToken(eHTMLTag_entity) {
|
|||
* @param aName -- string value to init token name with
|
||||
* @return
|
||||
*/
|
||||
CEntityToken::CEntityToken(const nsAReadableString& aName) : CHTMLToken(eHTMLTag_entity) {
|
||||
CEntityToken::CEntityToken(const nsAString& aName) : CHTMLToken(eHTMLTag_entity) {
|
||||
mTextValue.Assign(aName);
|
||||
#ifdef VERBOSE_DEBUG
|
||||
if(!VerifyEntityTable()) {
|
||||
|
|
@ -2212,7 +2212,7 @@ void CEntityToken::DebugDumpSource(nsOutputStream& out) {
|
|||
}
|
||||
#endif
|
||||
|
||||
const nsAReadableString& CEntityToken::GetStringValue(void)
|
||||
const nsAString& CEntityToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -2260,7 +2260,7 @@ CScriptToken::CScriptToken() : CHTMLToken(eHTMLTag_script) {
|
|||
* @param aName -- string to init token name with
|
||||
* @return
|
||||
*/
|
||||
CScriptToken::CScriptToken(const nsAReadableString& aString) : CHTMLToken(eHTMLTag_script) {
|
||||
CScriptToken::CScriptToken(const nsAString& aString) : CHTMLToken(eHTMLTag_script) {
|
||||
mTextValue.Assign(aString);
|
||||
}
|
||||
|
||||
|
|
@ -2287,7 +2287,7 @@ PRInt32 CScriptToken::GetTokenType(void) {
|
|||
return eToken_script;
|
||||
}
|
||||
|
||||
const nsAReadableString& CScriptToken::GetStringValue(void)
|
||||
const nsAString& CScriptToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -2302,7 +2302,7 @@ const nsAReadableString& CScriptToken::GetStringValue(void)
|
|||
CStyleToken::CStyleToken() : CHTMLToken(eHTMLTag_style) {
|
||||
}
|
||||
|
||||
CStyleToken::CStyleToken(const nsAReadableString& aString) : CHTMLToken(eHTMLTag_style) {
|
||||
CStyleToken::CStyleToken(const nsAString& aString) : CHTMLToken(eHTMLTag_style) {
|
||||
mTextValue.Assign(aString);
|
||||
}
|
||||
|
||||
|
|
@ -2328,7 +2328,7 @@ PRInt32 CStyleToken::GetTokenType(void) {
|
|||
return eToken_style;
|
||||
}
|
||||
|
||||
const nsAReadableString& CStyleToken::GetStringValue(void)
|
||||
const nsAString& CStyleToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -2372,7 +2372,7 @@ CInstructionToken::CInstructionToken() : CHTMLToken(eHTMLTag_instruction) {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
CInstructionToken::CInstructionToken(const nsAReadableString& aString) : CHTMLToken(eHTMLTag_unknown) {
|
||||
CInstructionToken::CInstructionToken(const nsAString& aString) : CHTMLToken(eHTMLTag_unknown) {
|
||||
mTextValue.Assign(aString);
|
||||
}
|
||||
|
||||
|
|
@ -2411,7 +2411,7 @@ PRInt32 CInstructionToken::GetTokenType(void){
|
|||
return eToken_instruction;
|
||||
}
|
||||
|
||||
const nsAReadableString& CInstructionToken::GetStringValue(void)
|
||||
const nsAString& CInstructionToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -2444,7 +2444,7 @@ const nsParserError * CErrorToken::GetError(void)
|
|||
return mError;
|
||||
}
|
||||
|
||||
const nsAReadableString& CErrorToken::GetStringValue(void)
|
||||
const nsAString& CErrorToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
|
@ -2455,7 +2455,7 @@ CDoctypeDeclToken::CDoctypeDeclToken(eHTMLTags aTag)
|
|||
: CHTMLToken(aTag) {
|
||||
}
|
||||
|
||||
CDoctypeDeclToken::CDoctypeDeclToken(const nsAReadableString& aString,eHTMLTags aTag)
|
||||
CDoctypeDeclToken::CDoctypeDeclToken(const nsAString& aString,eHTMLTags aTag)
|
||||
: CHTMLToken(aTag), mTextValue(aString) {
|
||||
}
|
||||
|
||||
|
|
@ -2515,12 +2515,12 @@ PRInt32 CDoctypeDeclToken::GetTokenType(void) {
|
|||
return eToken_doctypeDecl;
|
||||
}
|
||||
|
||||
const nsAReadableString& CDoctypeDeclToken::GetStringValue(void)
|
||||
const nsAString& CDoctypeDeclToken::GetStringValue(void)
|
||||
{
|
||||
return mTextValue;
|
||||
}
|
||||
|
||||
void CDoctypeDeclToken::SetStringValue(const nsAReadableString& aStr)
|
||||
void CDoctypeDeclToken::SetStringValue(const nsAString& aStr)
|
||||
{
|
||||
mTextValue.Assign(aStr);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -575,7 +575,7 @@ nsLoggingSink::WriteAttributes(const nsIParserNode& aNode) {
|
|||
for (PRInt32 i = 0; i < ac; i++) {
|
||||
char* key=nsnull;
|
||||
char* value=nsnull;
|
||||
const nsAReadableString& k = aNode.GetKeyAt(i);
|
||||
const nsAString& k = aNode.GetKeyAt(i);
|
||||
const nsAString& v = aNode.GetValueAt(i);
|
||||
|
||||
GetNewCString(k, &key);
|
||||
|
|
@ -697,7 +697,7 @@ nsLoggingSink::LeafNode(const nsIParserNode& aNode)
|
|||
}
|
||||
|
||||
nsresult
|
||||
nsLoggingSink::QuoteText(const nsAReadableString& aValue, nsString& aResult) {
|
||||
nsLoggingSink::QuoteText(const nsAString& aValue, nsString& aResult) {
|
||||
aResult.Truncate();
|
||||
/*
|
||||
if you're stepping through the string anyway, why not use iterators instead of forcing the string to copy?
|
||||
|
|
@ -734,7 +734,7 @@ nsLoggingSink::QuoteText(const nsAReadableString& aValue, nsString& aResult) {
|
|||
* @param aResult - String coverted to char*.
|
||||
*/
|
||||
nsresult
|
||||
nsLoggingSink::GetNewCString(const nsAReadableString& aValue, char** aResult)
|
||||
nsLoggingSink::GetNewCString(const nsAString& aValue, char** aResult)
|
||||
{
|
||||
nsresult result=NS_OK;
|
||||
nsAutoString temp;
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ public:
|
|||
NS_IMETHOD AddProcessingInstruction(const nsIParserNode& aNode);
|
||||
NS_IMETHOD AddDocTypeDecl(const nsIParserNode& aNode, PRInt32 aMode=0);
|
||||
NS_IMETHOD FlushPendingNotifications() { return NS_OK; }
|
||||
NS_IMETHOD SetDocumentCharset(nsAWritableString& aCharset) { return NS_OK; }
|
||||
NS_IMETHOD SetDocumentCharset(nsAString& aCharset) { return NS_OK; }
|
||||
NS_IMETHOD NotifyTagObservers(nsIParserNode* aNode) { return NS_OK; }
|
||||
|
||||
// nsIHTMLContentSink
|
||||
|
|
@ -105,8 +105,8 @@ public:
|
|||
nsresult CloseNode(const char* aKind);
|
||||
nsresult LeafNode(const nsIParserNode& aNode);
|
||||
nsresult WriteAttributes(const nsIParserNode& aNode);
|
||||
nsresult QuoteText(const nsAReadableString& aValue, nsString& aResult);
|
||||
nsresult GetNewCString(const nsAReadableString& aValue, char** aResult);
|
||||
nsresult QuoteText(const nsAString& aValue, nsString& aResult);
|
||||
nsresult GetNewCString(const nsAString& aValue, char** aResult);
|
||||
PRBool WillWriteAttributes(const nsIParserNode& aNode);
|
||||
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -501,7 +501,7 @@ void nsParser::SetDocumentCharset(const nsAString& aCharset, PRInt32 aCharsetSou
|
|||
mParserContext->mScanner->SetDocumentCharset(aCharset, aCharsetSource);
|
||||
}
|
||||
|
||||
void nsParser::SetSinkCharset(nsAWritableString& aCharset)
|
||||
void nsParser::SetSinkCharset(nsAString& aCharset)
|
||||
{
|
||||
if (mSink) {
|
||||
mSink->SetDocumentCharset(aCharset);
|
||||
|
|
@ -1531,7 +1531,7 @@ nsresult nsParser::Parse(nsIInputStream& aStream,const nsACString& aMimeType,PRB
|
|||
* @param aMimeType tells us what type of content to expect in the given string
|
||||
* @return error code -- 0 if ok, non-zero if error.
|
||||
*/
|
||||
nsresult nsParser::Parse(const nsAReadableString& aSourceBuffer, void* aKey,
|
||||
nsresult nsParser::Parse(const nsAString& aSourceBuffer, void* aKey,
|
||||
const nsACString& aMimeType,
|
||||
PRBool aVerifyEnabled, PRBool aLastCall,
|
||||
nsDTDMode aMode){
|
||||
|
|
@ -1641,7 +1641,7 @@ nsresult nsParser::Parse(const nsAReadableString& aSourceBuffer, void* aKey,
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
nsresult nsParser::ParseFragment(const nsAReadableString& aSourceBuffer,
|
||||
nsresult nsParser::ParseFragment(const nsAString& aSourceBuffer,
|
||||
void* aKey,
|
||||
nsVoidArray& aTagStack,
|
||||
PRUint32 anInsertPos,
|
||||
|
|
|
|||
|
|
@ -212,9 +212,9 @@ class nsParser : public nsIParser,
|
|||
* @param appendTokens tells us whether we should insert tokens inline, or append them.
|
||||
* @return TRUE if all went well -- FALSE otherwise
|
||||
*/
|
||||
virtual nsresult Parse(const nsAReadableString& aSourceBuffer,void* aKey,const nsACString& aContentType,PRBool aEnableVerify=PR_FALSE,PRBool aLastCall=PR_FALSE,nsDTDMode aMode=eDTDMode_autodetect);
|
||||
virtual nsresult Parse(const nsAString& aSourceBuffer,void* aKey,const nsACString& aContentType,PRBool aEnableVerify=PR_FALSE,PRBool aLastCall=PR_FALSE,nsDTDMode aMode=eDTDMode_autodetect);
|
||||
|
||||
virtual nsresult ParseFragment(const nsAReadableString& aSourceBuffer,
|
||||
virtual nsresult ParseFragment(const nsAString& aSourceBuffer,
|
||||
void* aKey,
|
||||
nsVoidArray& aTagStack,
|
||||
PRUint32 anInsertPos,
|
||||
|
|
@ -324,7 +324,7 @@ class nsParser : public nsIParser,
|
|||
nsString& oCharset,
|
||||
PRInt32& oCharsetSource);
|
||||
|
||||
void SetSinkCharset(nsAWritableString& aCharset);
|
||||
void SetSinkCharset(nsAString& aCharset);
|
||||
|
||||
/**
|
||||
* Removes continue parsing events
|
||||
|
|
|
|||
|
|
@ -197,8 +197,8 @@ const nsString& nsCParserNode::GetName() const {
|
|||
* @param
|
||||
* @return string ref of text from internal token
|
||||
*/
|
||||
const nsAReadableString& nsCParserNode::GetText() const {
|
||||
return (mToken) ? mToken->GetStringValue() : NS_STATIC_CAST(const nsAReadableString&,GetEmptyString());
|
||||
const nsAString& nsCParserNode::GetText() const {
|
||||
return (mToken) ? mToken->GetStringValue() : NS_STATIC_CAST(const nsAString&,GetEmptyString());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -283,7 +283,7 @@ PRInt32 nsCParserNode::GetAttributeCount(PRBool askToken) const{
|
|||
* @param anIndex-- offset of attribute to retrieve
|
||||
* @return string rep of given attribute text key
|
||||
*/
|
||||
const nsAReadableString& nsCParserNode::GetKeyAt(PRUint32 anIndex) const {
|
||||
const nsAString& nsCParserNode::GetKeyAt(PRUint32 anIndex) const {
|
||||
PRInt32 theCount = (mAttributes) ? mAttributes->GetSize() : 0;
|
||||
if((PRInt32)anIndex<theCount) {
|
||||
CAttributeToken* tkn=(CAttributeToken*)mAttributes->ObjectAt(anIndex);
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ class nsCParserNode : public nsIParserNode {
|
|||
* @update gess5/11/98
|
||||
* @return string containing node text
|
||||
*/
|
||||
virtual const nsAReadableString& GetText() const;
|
||||
virtual const nsAString& GetText() const;
|
||||
|
||||
/**
|
||||
* Retrieve skipped context from node
|
||||
|
|
@ -206,7 +206,7 @@ class nsCParserNode : public nsIParserNode {
|
|||
* @param anIndex is the index of the key you want
|
||||
* @return string containing key.
|
||||
*/
|
||||
virtual const nsAReadableString& GetKeyAt(PRUint32 anIndex) const;
|
||||
virtual const nsAString& GetKeyAt(PRUint32 anIndex) const;
|
||||
|
||||
/**
|
||||
* Retrieve the value (of key/value pair) at given index
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ nsParserService::HTMLCaseSensitiveAtomTagToId(nsIAtom* aAtom,
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsParserService::HTMLStringTagToId(const nsAReadableString &aTagName,
|
||||
nsParserService::HTMLStringTagToId(const nsAString &aTagName,
|
||||
PRInt32* aId) const
|
||||
{
|
||||
*aId = nsHTMLTags::LookupTag(aTagName);
|
||||
|
|
@ -84,7 +84,7 @@ nsParserService::HTMLIdToStringTag(PRInt32 aId,
|
|||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsParserService::HTMLConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
nsParserService::HTMLConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const
|
||||
{
|
||||
*aUnicode = nsHTMLEntities::EntityToUnicode(aEntity);
|
||||
|
|
|
|||
|
|
@ -36,12 +36,12 @@ public:
|
|||
|
||||
NS_IMETHOD HTMLCaseSensitiveAtomTagToId(nsIAtom* aAtom, PRInt32* aId) const;
|
||||
|
||||
NS_IMETHOD HTMLStringTagToId(const nsAReadableString &aTagName,
|
||||
NS_IMETHOD HTMLStringTagToId(const nsAString &aTagName,
|
||||
PRInt32* aId) const;
|
||||
|
||||
NS_IMETHOD HTMLIdToStringTag(PRInt32 aId, const PRUnichar **aTagName) const;
|
||||
|
||||
NS_IMETHOD HTMLConvertEntityToUnicode(const nsAReadableString& aEntity,
|
||||
NS_IMETHOD HTMLConvertEntityToUnicode(const nsAString& aEntity,
|
||||
PRInt32* aUnicode) const;
|
||||
NS_IMETHOD HTMLConvertUnicodeToEntity(PRInt32 aUnicode,
|
||||
nsCString& aEntity) const;
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ void nsScanner::Mark() {
|
|||
* @update harishd 01/12/99
|
||||
* @return error code
|
||||
*/
|
||||
PRBool nsScanner::UngetReadable(const nsAReadableString& aBuffer) {
|
||||
PRBool nsScanner::UngetReadable(const nsAString& aBuffer) {
|
||||
|
||||
mSlidingBuffer->UngetReadable(aBuffer,mCurrentPosition);
|
||||
mSlidingBuffer->BeginReading(mCurrentPosition); // Insertion invalidated our iterators
|
||||
|
|
@ -309,7 +309,7 @@ PRBool nsScanner::UngetReadable(const nsAReadableString& aBuffer) {
|
|||
* @update gess4/3/98
|
||||
* @return error code
|
||||
*/
|
||||
nsresult nsScanner::Append(const nsAReadableString& aBuffer) {
|
||||
nsresult nsScanner::Append(const nsAString& aBuffer) {
|
||||
|
||||
PRUnichar* buffer = ToNewUnicode(aBuffer);
|
||||
PRUint32 bufLen = aBuffer.Length();
|
||||
|
|
@ -527,7 +527,7 @@ nsresult nsScanner::Peek(PRUnichar& aChar, PRUint32 aOffset) {
|
|||
return result;
|
||||
}
|
||||
|
||||
nsresult nsScanner::Peek(nsAWritableString& aStr, PRInt32 aNumChars)
|
||||
nsresult nsScanner::Peek(nsAString& aStr, PRInt32 aNumChars)
|
||||
{
|
||||
if (!mSlidingBuffer) {
|
||||
return kEOF;
|
||||
|
|
@ -1193,7 +1193,7 @@ nsresult nsScanner::ReadWhile(nsString& aString,
|
|||
* the set of INVALID characters
|
||||
* @return error code
|
||||
*/
|
||||
nsresult nsScanner::ReadUntil(nsAWritableString& aString,
|
||||
nsresult nsScanner::ReadUntil(nsAString& aString,
|
||||
const nsReadEndCondition& aEndCondition,
|
||||
PRBool addTerminal)
|
||||
{
|
||||
|
|
@ -1317,7 +1317,7 @@ nsresult nsScanner::ReadUntil(nsReadingIterator<PRUnichar>& aStart,
|
|||
* @param
|
||||
* @return error code
|
||||
*/
|
||||
nsresult nsScanner::ReadUntil(nsAWritableString& aString,
|
||||
nsresult nsScanner::ReadUntil(nsAString& aString,
|
||||
PRUnichar aTerminalChar,
|
||||
PRBool addTerminal)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ class nsScannerString : public nsSlidingString {
|
|||
PRUnichar* aDataEnd,
|
||||
PRUnichar* aStorageEnd);
|
||||
|
||||
virtual void UngetReadable(const nsAReadableString& aReadable, const nsReadingIterator<PRUnichar>& aCurrentPosition) { InsertReadable(aReadable,aCurrentPosition); }
|
||||
virtual void UngetReadable(const nsAString& aReadable, const nsReadingIterator<PRUnichar>& aCurrentPosition) { InsertReadable(aReadable,aCurrentPosition); }
|
||||
virtual void ReplaceCharacter(nsReadingIterator<PRUnichar>& aPosition,
|
||||
PRUnichar aChar);
|
||||
};
|
||||
|
|
@ -141,7 +141,7 @@ class nsScanner {
|
|||
*/
|
||||
nsresult Peek(PRUnichar& ch, PRUint32 aOffset=0);
|
||||
|
||||
nsresult Peek(nsAWritableString& aStr, PRInt32 aNumChars);
|
||||
nsresult Peek(nsAString& aStr, PRInt32 aNumChars);
|
||||
|
||||
/**
|
||||
* Skip over chars as long as they're in aSkipSet
|
||||
|
|
@ -227,7 +227,7 @@ class nsScanner {
|
|||
* @param addTerminal tells us whether to append terminal to aString
|
||||
* @return error code
|
||||
*/
|
||||
nsresult ReadUntil(nsAWritableString& aString,
|
||||
nsresult ReadUntil(nsAString& aString,
|
||||
PRUnichar aTerminal,
|
||||
PRBool addTerminal);
|
||||
|
||||
|
|
@ -241,7 +241,7 @@ class nsScanner {
|
|||
* @param addTerminal tells us whether to append terminal to aString
|
||||
* @return error code
|
||||
*/
|
||||
nsresult ReadUntil(nsAWritableString& aString,
|
||||
nsresult ReadUntil(nsAString& aString,
|
||||
const nsReadEndCondition& aEndCondition,
|
||||
PRBool addTerminal);
|
||||
|
||||
|
|
@ -293,7 +293,7 @@ class nsScanner {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
PRBool UngetReadable(const nsAReadableString& aBuffer);
|
||||
PRBool UngetReadable(const nsAString& aBuffer);
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -302,7 +302,7 @@ class nsScanner {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
nsresult Append(const nsAReadableString& aBuffer);
|
||||
nsresult Append(const nsAString& aBuffer);
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
|
|||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче