Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1083210 - Part 2: Make DOM Promise call the JS::dbg::onNewPromise hook. r=bz

Browse Source
This commit is contained in:
Nick Fitzgerald 2014-11-17 10:42:00 +01:00
parent d3db1f03ed
commit 8100009108
3 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/promise/Promise.cpp
View File

@ -7,6 +7,7 @@
#include "mozilla/dom/Promise.h" #include "mozilla/dom/Promise.h"
#include "jsfriendapi.h" #include "jsfriendapi.h"
#include "js/Debug.h"
#include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/BindingUtils.h"
#include "mozilla/dom/DOMError.h" #include "mozilla/dom/DOMError.h"
#include "mozilla/dom/OwningNonNull.h" #include "mozilla/dom/OwningNonNull.h"
@ -324,8 +325,8 @@ Promise::CreateWrapper(ErrorResult& aRv)
} }
JSContext* cx = jsapi.cx(); JSContext* cx = jsapi.cx();
JS::Rooted<JS::Value> ignored(cx); JS::Rooted<JS::Value> wrapper(cx);
if (!WrapNewBindingObject(cx, this, &ignored)) { if (!WrapNewBindingObject(cx, this, &wrapper)) {
JS_ClearPendingException(cx); JS_ClearPendingException(cx);
aRv.Throw(NS_ERROR_OUT_OF_MEMORY); aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
return; return;
@ -339,6 +340,9 @@ Promise::CreateWrapper(ErrorResult& aRv)
aRv.Throw(NS_ERROR_OUT_OF_MEMORY); aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
return; return;
} }
JS::RootedObject obj(cx, &wrapper.toObject());
JS::dbg::onNewPromise(cx, obj);
} }
void void

1
dom/promise/tests/chrome.ini
View File

@ -1,3 +1,4 @@
[DEFAULT] [DEFAULT]
[test_dependentPromises.html] [test_dependentPromises.html]
[test_on_new_promise.html]

45
dom/promise/tests/test_on_new_promise.html Normal file
View File

@ -0,0 +1,45 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<!--
Bug 1083210 - Sanity test for interaction between DOM promises and
Debugger.prototype.onNewPromise.
-->
<html>
<head>
<title>Test for interaction with SpiderMonkey's Debugger.prototype.onNewPromise</title>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script type="application/javascript">
is(Object.prototype.toString.call(new Promise(function () {})),
"[object Promise]",
"We should have the native DOM promise implementation.");
var Cu = Components.utils;
Cu.import("resource://gre/modules/jsdebugger.jsm");
var dbgGlobal = new Cu.Sandbox(document.nodePrincipal);
addDebuggerToGlobal(dbgGlobal);
var dbg = new dbgGlobal.Debugger(this);
var wrappedPromise;
dbg.onNewPromise = function (wp) { wrappedPromise = wp; };
var promise = new Promise(function () {});
debugger;
ok(wrappedPromise);
is(wrappedPromise.unsafeDereference(), promise);
</script>
</pre>
</body>
</html>