mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1165162 - Rework the nsIScriptSecurityManager principal-minting API to be originAttributes-centric. r=gabor,r=bholley,sr=sicking (269536132) - pointer style and mispatch (38b32b3bc) - more misspatch & pointer style (ff2bc3057) - Bug 1164014 - Fixing defaultShims. r=billm (bcf7f671a) - Bug 1164014 - Workaround for GC bug 1172193. r=gkrizsanits (b25cf4dea) - Bug 1158427 - r=roc (64037cb2c) - Bug 1157994 - Ensure AudioContext operations are started and resolved in the same order. r=roc (757de0f81) - Bug 1127188 - Properly handle AudioContext.close() calls right after the creation of an AudioContext. r=ehsan (88362873f) - Bug 1164011 - interposition for CPOWS. r=billm (24a8134f6) - Bug 1164014 - Shim optimization. r=billm (9a8498684) - Bug 1178581 - Interning does not and should not imply infinite lifetime; r=sfink (91dfc5b77) - Bug 1171053 - Remove JS_BindCallable. r=efaust (2e59b8c62) - Bug 1174372 - Initialize ExecutableAllocator static fields in JS_Init. r=luke (d02620196) - missing uid of 968334 (3c73a17db) - missing uuid of 1152577 (13d58364c) - add missing uuid of 1050500 (16c61b629) - Bug 110567 - Remove nsIDocShell::GetURLSearchParams(), r=smaug (5018a0936) - Bug 1132518, add a flag to nsIFrameTraversal to skip the popup checks, r=mats (8482fd8fd) - Bug 1132518, make document navigation with F6/Shift+F6 work in e10s. This combines the document and tab navigation mechanisms together, r=smaug (2085e999b) - Bug 1160307 - Capture async stack frames on Javascript timeline markers. r=fitzgen, r=smaug, r=Paolo (95c3e6b95)
This commit is contained in:
@@ -600,7 +600,8 @@ AutoEntryScript::DocshellEntryMonitor::DocshellEntryMonitor(JSContext* aCx,
|
||||
|
||||
void
|
||||
AutoEntryScript::DocshellEntryMonitor::Entry(JSContext* aCx, JSFunction* aFunction,
|
||||
JSScript* aScript)
|
||||
JSScript* aScript, JS::Handle<JS::Value> aAsyncStack,
|
||||
JS::Handle<JSString*> aAsyncCause)
|
||||
{
|
||||
JS::Rooted<JSFunction*> rootedFunction(aCx);
|
||||
if (aFunction) {
|
||||
@@ -645,10 +646,13 @@ AutoEntryScript::DocshellEntryMonitor::Entry(JSContext* aCx, JSFunction* aFuncti
|
||||
const char16_t* functionNameChars = functionName.isTwoByte() ?
|
||||
functionName.twoByteChars() : nullptr;
|
||||
|
||||
JS::Rooted<JS::Value> asyncCauseValue(aCx, aAsyncCause ? StringValue(aAsyncCause) :
|
||||
JS::NullValue());
|
||||
docShellForJSRunToCompletion->NotifyJSRunToCompletionStart(mReason,
|
||||
functionNameChars,
|
||||
filename.BeginReading(),
|
||||
lineNumber);
|
||||
lineNumber, aAsyncStack,
|
||||
asyncCauseValue);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user