1 files changed, 12 insertions, 7 deletions
diff --git a/WebKit/android/TimeCounter.cpp b/WebKit/android/TimeCounter.cpp
index 0dc0f3e..c92afb2 100644
--- a/WebKit/android/TimeCounter.cpp
+++ b/WebKit/android/TimeCounter.cpp
@@ -56,19 +56,18 @@ uint32_t TimeCounter::sLastCounter[TimeCounter::TotalTimeCounterCount];
 uint32_t TimeCounter::sStartTime[TimeCounter::TotalTimeCounterCount];
 
 static const char* timeCounterNames[] = {
-    "css parsing", 
-    "javascript",
     "calculate style", 
+    "css parsing", 
     "Java callback (frame bridge)",
-    "parsing (may include calcStyle or Java callback)", 
     "layout", 
     "native 1 (frame bridge)",
-    "native 2 (resource load)", 
-    "native 3 (shared timer)", 
+    "parsing (may include calcStyle or Java callback)", 
+    "native 3 (resource load)", 
+    "native 2 (shared timer)", 
     "build nav (webview core)",
+    "draw content (webview core)",
     "record content (webview core)",
-    "native 4 (webview core)",
-    "draw content (webview ui)",
+    "native 4 (webview core)"
 };
 
 void TimeCounter::record(enum Type type, const char* functionName)
@@ -93,6 +92,8 @@ void TimeCounter::report(const KURL& url, int live, int dead)
     int threadTime = get_thread_msec() - sStartThreadTime;
     LOGD("*-* Total load time: %d ms, thread time: %d ms for %s\n",
         totalTime, threadTime, urlString.utf8().data());
+// FIXME: JSGlobalObject no longer records time
+//    JSC::JSGlobalObject::reportTimeCounter();
     for (Type type = (Type) 0; type < TotalTimeCounterCount; type 
             = (Type) (type + 1)) {
         char scratch[256];
@@ -114,6 +115,8 @@ void TimeCounter::reportNow()
     LOGD("*-* Elapsed time: %d ms, ui thread time: %d ms, webcore thread time:"
         " %d ms\n", elapsedTime, elapsedThreadTime, sEndWebCoreThreadTime -
         sStartWebCoreThreadTime);
+// FIXME: JSGlobalObject no longer records time
+//    JSC::JSGlobalObject::reportTimeCounter();
     for (Type type = (Type) 0; type < TotalTimeCounterCount; type 
             = (Type) (type + 1)) {
         if (sTotalTimeUsed[type] == sLastTimeUsed[type])
@@ -134,6 +137,8 @@ void TimeCounter::reportNow()
 }
 
 void TimeCounter::reset() {
+// FIXME: JSGlobalObject no longer records time
+//    JSC::JSGlobalObject::resetTimeCounter();
     bzero(sTotalTimeUsed, sizeof(sTotalTimeUsed));
     bzero(sCounter, sizeof(sCounter));
     LOGD("*-* Start browser instrument\n");