corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 913586 (Part 6) - Update Maybe users in js. r=luke

Browse Source
This commit is contained in:
Seth Fowler
2014-08-13 15:42:00 -07:00
parent d66d868ac4
commit 6d30ddc363
30 changed files with 206 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jsproxy.cpp
View File

@@ -54,8 +54,8 @@ js::AutoEnterPolicy::recordEnter(JSContext *cx, HandleObject proxy, HandleId id,
{
if (allowed()) {
context = cx;
enteredProxy.construct(proxy);
enteredId.construct(id);
enteredProxy.emplace(proxy);
enteredId.emplace(id);
enteredAction = act;
prev = cx->runtime()->enteredPolicy;
cx->runtime()->enteredPolicy = this;
@@ -65,7 +65,7 @@ js::AutoEnterPolicy::recordEnter(JSContext *cx, HandleObject proxy, HandleId id,
void
js::AutoEnterPolicy::recordLeave()
{
if (!enteredProxy.empty()) {
if (enteredProxy) {
JS_ASSERT(context->runtime()->enteredPolicy == this);
context->runtime()->enteredPolicy = prev;
}
@@ -77,8 +77,8 @@ js::assertEnteredPolicy(JSContext *cx, JSObject *proxy, jsid id,
{
MOZ_ASSERT(proxy->is<ProxyObject>());
MOZ_ASSERT(cx->runtime()->enteredPolicy);
MOZ_ASSERT(cx->runtime()->enteredPolicy->enteredProxy.ref().get() == proxy);
MOZ_ASSERT(cx->runtime()->enteredPolicy->enteredId.ref().get() == id);
MOZ_ASSERT(cx->runtime()->enteredPolicy->enteredProxy->get() == proxy);
MOZ_ASSERT(cx->runtime()->enteredPolicy->enteredId->get() == id);
MOZ_ASSERT(cx->runtime()->enteredPolicy->enteredAction & act);
}
#endif