зеркало из https://github.com/mozilla/gecko-dev.git
Bug 738761 - Remove nsIScriptTimeoutHandler::GetScriptVersion and pass JSVersion to nsIScriptContext::EvaluateString; r=jst
This commit is contained in:
Родитель
0c27c0fd25
Коммит
339ed99017
|
@ -918,7 +918,8 @@ nsScriptLoader::EvaluateScript(nsScriptLoadRequest* aRequest,
|
||||||
mDocument->NodePrincipal(),
|
mDocument->NodePrincipal(),
|
||||||
aRequest->mOriginPrincipal,
|
aRequest->mOriginPrincipal,
|
||||||
url.get(), aRequest->mLineNo,
|
url.get(), aRequest->mLineNo,
|
||||||
aRequest->mJSVersion, nsnull, &isUndefined);
|
JSVersion(aRequest->mJSVersion), nsnull,
|
||||||
|
&isUndefined);
|
||||||
|
|
||||||
// Put the old script back in case it wants to do anything else.
|
// Put the old script back in case it wants to do anything else.
|
||||||
mCurrentScript = oldCurrent;
|
mCurrentScript = oldCurrent;
|
||||||
|
|
|
@ -9319,8 +9319,7 @@ nsGlobalWindow::RunTimeout(nsTimeout *aTimeout)
|
||||||
bool is_undefined;
|
bool is_undefined;
|
||||||
scx->EvaluateString(nsDependentString(script), FastGetGlobalJSObject(),
|
scx->EvaluateString(nsDependentString(script), FastGetGlobalJSObject(),
|
||||||
timeout->mPrincipal, timeout->mPrincipal,
|
timeout->mPrincipal, timeout->mPrincipal,
|
||||||
filename, lineNo,
|
filename, lineNo, JSVERSION_DEFAULT, nsnull,
|
||||||
handler->GetScriptVersion(), nsnull,
|
|
||||||
&is_undefined);
|
&is_undefined);
|
||||||
} else {
|
} else {
|
||||||
nsCOMPtr<nsIVariant> dummy;
|
nsCOMPtr<nsIVariant> dummy;
|
||||||
|
|
|
@ -124,7 +124,7 @@ public:
|
||||||
nsIPrincipal *aOriginPrincipal,
|
nsIPrincipal *aOriginPrincipal,
|
||||||
const char *aURL,
|
const char *aURL,
|
||||||
PRUint32 aLineNo,
|
PRUint32 aLineNo,
|
||||||
PRUint32 aVersion,
|
JSVersion aVersion,
|
||||||
nsAString *aRetValue,
|
nsAString *aRetValue,
|
||||||
bool* aIsUndefined) = 0;
|
bool* aIsUndefined) = 0;
|
||||||
|
|
||||||
|
|
|
@ -42,9 +42,8 @@
|
||||||
class nsIArray;
|
class nsIArray;
|
||||||
|
|
||||||
#define NS_ISCRIPTTIMEOUTHANDLER_IID \
|
#define NS_ISCRIPTTIMEOUTHANDLER_IID \
|
||||||
{ /* {17a9ce1a-d73b-45d1-8145-a0ae57bcc76e} */ \
|
{ 0xd60ec934, 0x0c75, 0x4777, \
|
||||||
0x17a9ce1a, 0xd73b, 0x45d1, \
|
{ 0xba, 0x41, 0xb8, 0x2f, 0x37, 0xc9, 0x13, 0x56 } }
|
||||||
{ 0x81, 0x45, 0xa0, 0xae, 0x57, 0xbc, 0xc7, 0x6e } }
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Abstraction of the script objects etc required to do timeouts in a
|
* Abstraction of the script objects etc required to do timeouts in a
|
||||||
|
@ -75,9 +74,6 @@ public:
|
||||||
// If a script object, get the argv suitable for passing back to the
|
// If a script object, get the argv suitable for passing back to the
|
||||||
// script context.
|
// script context.
|
||||||
virtual nsIArray *GetArgv() = 0;
|
virtual nsIArray *GetArgv() = 0;
|
||||||
|
|
||||||
// Get the language version for this timeout.
|
|
||||||
virtual PRUint32 GetScriptVersion() = 0;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptTimeoutHandler,
|
NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptTimeoutHandler,
|
||||||
|
|
|
@ -1358,7 +1358,7 @@ nsJSContext::EvaluateString(const nsAString& aScript,
|
||||||
nsIPrincipal *aOriginPrincipal,
|
nsIPrincipal *aOriginPrincipal,
|
||||||
const char *aURL,
|
const char *aURL,
|
||||||
PRUint32 aLineNo,
|
PRUint32 aLineNo,
|
||||||
PRUint32 aVersion,
|
JSVersion aVersion,
|
||||||
nsAString *aRetValue,
|
nsAString *aRetValue,
|
||||||
bool* aIsUndefined)
|
bool* aIsUndefined)
|
||||||
{
|
{
|
||||||
|
|
|
@ -88,7 +88,7 @@ public:
|
||||||
nsIPrincipal *originPrincipal,
|
nsIPrincipal *originPrincipal,
|
||||||
const char *aURL,
|
const char *aURL,
|
||||||
PRUint32 aLineNo,
|
PRUint32 aLineNo,
|
||||||
PRUint32 aVersion,
|
JSVersion aVersion,
|
||||||
nsAString *aRetValue,
|
nsAString *aRetValue,
|
||||||
bool* aIsUndefined);
|
bool* aIsUndefined);
|
||||||
virtual nsresult EvaluateStringWithValue(const nsAString& aScript,
|
virtual nsresult EvaluateStringWithValue(const nsAString& aScript,
|
||||||
|
|
|
@ -79,9 +79,6 @@ public:
|
||||||
virtual PRUint32 GetScriptTypeID() {
|
virtual PRUint32 GetScriptTypeID() {
|
||||||
return nsIProgrammingLanguage::JAVASCRIPT;
|
return nsIProgrammingLanguage::JAVASCRIPT;
|
||||||
}
|
}
|
||||||
virtual PRUint32 GetScriptVersion() {
|
|
||||||
return mVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual nsIArray *GetArgv() {
|
virtual nsIArray *GetArgv() {
|
||||||
return mArgv;
|
return mArgv;
|
||||||
|
|
|
@ -363,7 +363,7 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel,
|
||||||
principal,
|
principal,
|
||||||
mURL.get(), // url
|
mURL.get(), // url
|
||||||
1, // line no
|
1, // line no
|
||||||
nsnull,
|
JSVERSION_DEFAULT,
|
||||||
&result,
|
&result,
|
||||||
&isUndefined);
|
&isUndefined);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче