1 files changed, 26 insertions, 12 deletions

diff --git a/Source/WebKit/android/jni/JavaBridge.cpp b/Source/WebKit/android/jni/JavaBridge.cpp
index 9f89ccd..68eb367 100644
--- a/Source/WebKit/android/jni/JavaBridge.cpp
+++ b/Source/WebKit/android/jni/JavaBridge.cpp
@@ -41,6 +41,9 @@
 #include "PluginDatabase.h"
 #include "Timer.h"
 #include "TimerClient.h"
+#ifdef ANDROID_INSTRUMENT
+#include "TimeCounter.h"
+#endif
 #include "WebCache.h"
 #include "WebCoreJni.h"
 
@@ -145,15 +148,15 @@ JavaBridge::JavaBridge(JNIEnv* env, jobject obj)
     mResolveFilePathForContentUri = env->GetMethodID(clazz, "resolveFilePathForContentUri", "(Ljava/lang/String;)Ljava/lang/String;");
     env->DeleteLocalRef(clazz);
 
-    ALOG_ASSERT(mSetSharedTimer, "Could not find method setSharedTimer");
-    ALOG_ASSERT(mStopSharedTimer, "Could not find method stopSharedTimer");
-    ALOG_ASSERT(mSetCookies, "Could not find method setCookies");
-    ALOG_ASSERT(mCookies, "Could not find method cookies");
-    ALOG_ASSERT(mCookiesEnabled, "Could not find method cookiesEnabled");
-    ALOG_ASSERT(mGetPluginDirectories, "Could not find method getPluginDirectories");
-    ALOG_ASSERT(mGetPluginSharedDataDirectory, "Could not find method getPluginSharedDataDirectory");
-    ALOG_ASSERT(mGetKeyStrengthList, "Could not find method getKeyStrengthList");
-    ALOG_ASSERT(mGetSignedPublicKey, "Could not find method getSignedPublicKey");
+    LOG_ASSERT(mSetSharedTimer, "Could not find method setSharedTimer");
+    LOG_ASSERT(mStopSharedTimer, "Could not find method stopSharedTimer");
+    LOG_ASSERT(mSetCookies, "Could not find method setCookies");
+    LOG_ASSERT(mCookies, "Could not find method cookies");
+    LOG_ASSERT(mCookiesEnabled, "Could not find method cookiesEnabled");
+    LOG_ASSERT(mGetPluginDirectories, "Could not find method getPluginDirectories");
+    LOG_ASSERT(mGetPluginSharedDataDirectory, "Could not find method getPluginSharedDataDirectory");
+    LOG_ASSERT(mGetKeyStrengthList, "Could not find method getKeyStrengthList");
+    LOG_ASSERT(mGetSignedPublicKey, "Could not find method getSignedPublicKey");
 
     JavaSharedClient::SetTimerClient(this);
     JavaSharedClient::SetCookieClient(this);
@@ -280,7 +283,7 @@ JavaBridge::getPluginSharedDataDirectory()
 void
 JavaBridge::setSharedTimerCallback(void (*f)())
 {
-    ALOG_ASSERT(!sSharedTimerFiredCallback || sSharedTimerFiredCallback==f,
+    LOG_ASSERT(!sSharedTimerFiredCallback || sSharedTimerFiredCallback==f,
                "Shared timer callback may already be set or null!");
 
     sSharedTimerFiredCallback = f;
@@ -360,8 +363,8 @@ void JavaBridge::Finalize(JNIEnv* env, jobject obj)
 {
     JavaBridge* javaBridge = (JavaBridge*)
         (env->GetIntField(obj, gJavaBridge_ObjectID));    
-    ALOG_ASSERT(javaBridge, "Finalize should not be called twice for the same java bridge!");
-    ALOGV("webcore_javabridge::nativeFinalize(%p)\n", javaBridge);
+    LOG_ASSERT(javaBridge, "Finalize should not be called twice for the same java bridge!");
+    LOGV("webcore_javabridge::nativeFinalize(%p)\n", javaBridge);
     delete javaBridge;
     env->SetIntField(obj, gJavaBridge_ObjectID, 0);
 }
@@ -370,7 +373,16 @@ void JavaBridge::Finalize(JNIEnv* env, jobject obj)
 void JavaBridge::SharedTimerFired(JNIEnv* env, jobject)
 {
     if (sSharedTimerFiredCallback)
+    {
+#ifdef ANDROID_INSTRUMENT
+        TimeCounter::start(TimeCounter::SharedTimerTimeCounter);
+#endif
+        SkAutoMemoryUsageProbe  mup("JavaBridge::sharedTimerFired");
         sSharedTimerFiredCallback();
+#ifdef ANDROID_INSTRUMENT
+        TimeCounter::record(TimeCounter::SharedTimerTimeCounter, __FUNCTION__);
+#endif
+    }
 }
 
 void JavaBridge::SetCacheSize(JNIEnv* env, jobject obj, jint bytes)
@@ -469,10 +481,12 @@ void JavaBridge::RemovePackageName(JNIEnv* env, jobject obj, jstring packageName
 
 void JavaBridge::UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy, jstring newExList)
 {
+#if USE(CHROME_NETWORK_STACK)
     std::string proxy = jstringToStdString(env, newProxy);
     std::string exList = jstringToStdString(env, newExList);
     WebCache::get(false)->proxy()->UpdateProxySettings(proxy, exList);
     WebCache::get(true)->proxy()->UpdateProxySettings(proxy, exList);
+#endif
 }