Backed out changeset a7221c06e193 (bug 1096666) for check_spidermonkey_style.py failures

CLOSED TREE
This commit is contained in:
Phil Ringnalda 2014-12-09 23:00:05 -08:00
parent 1b1aa5dd75
commit 06d2a12db7
2 changed files with 2 additions and 16 deletions

View File

@ -51,7 +51,6 @@ JSCompartment::JSCompartment(Zone *zone, const JS::CompartmentOptions &options =
#endif
global_(nullptr),
enterCompartmentDepth(0),
totalTime(0),
data(nullptr),
objectMetadataCallback(nullptr),
lastAnimationTime(0),

View File

@ -14,7 +14,6 @@
#include "vm/GlobalObject.h"
#include "vm/PIC.h"
#include "vm/SavedStacks.h"
#include "prmjtime.h"
namespace js {
@ -167,22 +166,10 @@ struct JSCompartment
js::ReadBarrieredGlobalObject global_;
unsigned enterCompartmentDepth;
int64_t startInterval;
public:
int64_t totalTime;
void enter() {
if (addonId && !enterCompartmentDepth) {
startInterval = PRMJ_Now();
}
enterCompartmentDepth++;
}
void leave() {
enterCompartmentDepth--;
if (addonId && !enterCompartmentDepth) {
totalTime += (PRMJ_Now() - startInterval);
}
}
void enter() { enterCompartmentDepth++; }
void leave() { enterCompartmentDepth--; }
bool hasBeenEntered() { return !!enterCompartmentDepth; }
JS::Zone *zone() { return zone_; }