Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

if you want a pointer to the characters, you're going to have to |.get()| it

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@78962 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scc%mozilla.org
2000-09-13 03:24:57 +00:00
parent 06c6e22087
commit 7ebc69efce
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/dom/src/base/nsDOMWindowList.cpp
View File

@@ -146,7 +146,7 @@ nsDOMWindowList::NamedItem(const nsAReadableString& aName, nsIDOMWindow** aRetur
}
}
mDocShellNode->FindChildWithName(nsPromiseFlatString(aName),
mDocShellNode->FindChildWithName(nsPromiseFlatString(aName).get(),
PR_FALSE, PR_FALSE,
nsnull, getter_AddRefs(item));

12
mozilla/dom/src/base/nsGlobalWindow.cpp
View File

@@ -893,7 +893,7 @@ NS_IMETHODIMP GlobalWindowImpl::SetStatus(const nsAReadableString& aStatus)
nsCOMPtr<nsIWebBrowserChrome> browserChrome;
GetWebBrowserChrome(getter_AddRefs(browserChrome));
if(browserChrome)
browserChrome->SetStatus(nsIWebBrowserChrome::STATUS_SCRIPT, nsPromiseFlatString(aStatus));
browserChrome->SetStatus(nsIWebBrowserChrome::STATUS_SCRIPT, nsPromiseFlatString(aStatus).get());
return NS_OK;
}
@@ -911,7 +911,7 @@ NS_IMETHODIMP GlobalWindowImpl::SetDefaultStatus(const nsAReadableString& aDefau
nsCOMPtr<nsIWebBrowserChrome> browserChrome;
GetWebBrowserChrome(getter_AddRefs(browserChrome));
if(browserChrome)
browserChrome->SetStatus(nsIWebBrowserChrome::STATUS_SCRIPT_DEFAULT, nsPromiseFlatString(aDefaultStatus));
browserChrome->SetStatus(nsIWebBrowserChrome::STATUS_SCRIPT_DEFAULT, nsPromiseFlatString(aDefaultStatus).get());
return NS_OK;
}
@@ -932,7 +932,7 @@ NS_IMETHODIMP GlobalWindowImpl::SetName(const nsAReadableString& aName)
nsresult result = NS_OK;
nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(mDocShell));
if (docShellAsItem)
result = docShellAsItem->SetName(nsPromiseFlatString(aName));
result = docShellAsItem->SetName(nsPromiseFlatString(aName).get());
return result;
}
@@ -1038,7 +1038,7 @@ GlobalWindowImpl::SetTitle(const nsAReadableString& aTitle)
treeOwner->GetPrimaryContentShell(getter_AddRefs(primaryContent));
nsCOMPtr<nsIBaseWindow> docShellAsWin(do_QueryInterface(primaryContent));
if (docShellAsWin) {
docShellAsWin->SetTitle(nsPromiseFlatString(aTitle));
docShellAsWin->SetTitle(nsPromiseFlatString(aTitle).get());
}
}
}
@@ -2072,7 +2072,9 @@ NS_IMETHODIMP GlobalWindowImpl::Escape(const nsAReadableString& aStr, nsAWritabl
PRInt32 maxByteLen, srcLen;
srcLen = aStr.Length();
const PRUnichar* src = nsPromiseFlatString(aStr);
nsPromiseFlatString flatSrc(aStr);
const PRUnichar* src = flatSrc.get();
// Get the expected length of result string
result = encoder->GetMaxLength(src, srcLen, &maxByteLen);

8
mozilla/dom/src/base/nsJSEnvironment.cpp
View File

@@ -460,7 +460,7 @@ nsJSContext::EvaluateStringWithValue(const nsAReadableString& aScript,
ok = ::JS_EvaluateUCScriptForPrincipals(mContext,
(JSObject *)aScopeObject,
jsprin,
(jschar*)(const PRUnichar*)nsPromiseFlatString(aScript),
(jschar*)(const PRUnichar*)nsPromiseFlatString(aScript).get(),
aScript.Length(),
aURL,
aLineNo,
@@ -576,7 +576,7 @@ nsJSContext::EvaluateString(const nsAReadableString& aScript,
ok = ::JS_EvaluateUCScriptForPrincipals(mContext,
(JSObject *)aScopeObject,
jsprin,
(jschar*)(const PRUnichar*)nsPromiseFlatString(aScript),
(jschar*)(const PRUnichar*)nsPromiseFlatString(aScript).get(),
aScript.Length(),
aURL,
aLineNo,
@@ -800,7 +800,7 @@ nsJSContext::CompileEventHandler(void *aTarget, nsIAtom *aName,
JSFunction* fun =
::JS_CompileUCFunctionForPrincipals(mContext, target, jsprin,
charName, 1, gEventArgv,
(jschar*)(const PRUnichar*)nsPromiseFlatString(aBody),
(jschar*)(const PRUnichar*)nsPromiseFlatString(aBody).get(),
aBody.Length(),
//XXXbe filename, lineno:
nsnull, 0);
@@ -850,7 +850,7 @@ nsJSContext::CompileFunction(void* aTarget,
JSFunction* fun =
::JS_CompileUCFunctionForPrincipals(mContext, target, jsprin,
aName, aArgCount, aArgArray,
(jschar*)(const PRUnichar*)nsPromiseFlatString(aBody),
(jschar*)(const PRUnichar*)nsPromiseFlatString(aBody).get(),
aBody.Length(),
aURL, aLineNo);