AI 145799: Added back the ANDROID_INSTRUMENT for JS.

Automated import of CL 145799

diff --git a/JavaScriptCore/interpreter/Interpreter.h b/JavaScriptCore/interpreter/Interpreter.h
index 7d97962..3f261d4 100644 (file)
--- a/JavaScriptCore/interpreter/Interpreter.h
+++ b/JavaScriptCore/interpreter/Interpreter.h
@@ -37,10 +37,6 @@
 #include "RegisterFile.h"
 #include <wtf/HashMap.h>
 
-#ifdef ANDROID_INSTRUMENT
-#include "TimeCounter.h"
-#endif
-
 namespace JSC {
 
     class CodeBlock;

diff --git a/JavaScriptCore/runtime/TimeoutChecker.h b/JavaScriptCore/runtime/TimeoutChecker.h
index 7bfa6d0..18bc36b 100644 (file)
--- a/JavaScriptCore/runtime/TimeoutChecker.h
+++ b/JavaScriptCore/runtime/TimeoutChecker.h
@@ -31,6 +31,10 @@
 
 #include <wtf/Assertions.h>
 
+#ifdef ANDROID_INSTRUMENT
+#include "TimeCounter.h"
+#endif
+
 namespace JSC {
 
     class ExecState;
@@ -47,6 +51,10 @@ namespace JSC {
         {
             if (!m_startCount)
                 reset();
+#ifdef ANDROID_INSTRUMENT
+            if (!m_startCount)
+                android::TimeCounter::start(android::TimeCounter::JavaScriptTimeCounter);
+#endif
             ++m_startCount;
         }
 
@@ -54,6 +62,10 @@ namespace JSC {
         {
             ASSERT(m_startCount);
             --m_startCount;
+#ifdef ANDROID_INSTRUMENT
+            if (!m_startCount)
+                android::TimeCounter::record(android::TimeCounter::JavaScriptTimeCounter, __FUNCTION__);
+#endif
         }
 
         void reset();