From 06d2a12db7e2d6afd86a4a6855e5847c00d47cbb Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Tue, 9 Dec 2014 23:00:05 -0800
Subject: [PATCH] Backed out changeset a7221c06e193 (bug 1096666) for
 check_spidermonkey_style.py failures CLOSED TREE

---
 js/src/jscompartment.cpp |  1 -
 js/src/jscompartment.h   | 17 ++---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 75a6861589a..a759afaf294 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -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),
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index fb58f7b579f..e13b0f4c644 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -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_; }