3 files changed, 4 insertions, 20 deletions
diff --git a/WebKit/android/TimerClient.h b/WebKit/android/TimerClient.h
index 09f9fc0..f8cbb9d 100644
--- a/WebKit/android/TimerClient.h
+++ b/WebKit/android/TimerClient.h
@@ -35,6 +35,7 @@ namespace android {
         virtual void setSharedTimerCallback(void(*f)()) = 0;
         virtual void setSharedTimer(long long timemillis) = 0;
         virtual void stopSharedTimer() = 0;
+        virtual void signalServiceFuncPtrQueue() = 0;
     };
 
 }
diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp
index eefeea5..24ca71c 100644
--- a/WebKit/android/jni/JavaBridge.cpp
+++ b/WebKit/android/jni/JavaBridge.cpp
@@ -82,7 +82,7 @@ public:
 
     ////////////////////////////////////////////
 
-    void signalServiceFuncPtrQueue();
+    virtual void signalServiceFuncPtrQueue();
 
     // jni functions
     static void Constructor(JNIEnv* env, jobject obj);
@@ -104,7 +104,6 @@ private:
 };
 
 static void (*sSharedTimerFiredCallback)();
-static JavaBridge* gJavaBridge;
 
 JavaBridge::JavaBridge(JNIEnv* env, jobject obj)
 {
@@ -126,7 +125,6 @@ JavaBridge::JavaBridge(JNIEnv* env, jobject obj)
 
     JavaSharedClient::SetTimerClient(this);
     JavaSharedClient::SetCookieClient(this);
-    gJavaBridge = this;
 }   
     
 JavaBridge::~JavaBridge()
@@ -220,14 +218,6 @@ void JavaBridge::signalServiceFuncPtrQueue()
 
 // ----------------------------------------------------------------------------
 
-// visible to Shared
-void AndroidSignalServiceFuncPtrQueue()
-{
-    gJavaBridge->signalServiceFuncPtrQueue();
-}
-
-// ----------------------------------------------------------------------------
-
 void JavaBridge::Constructor(JNIEnv* env, jobject obj)
 {
     JavaBridge* javaBridge = new JavaBridge(env, obj);
diff --git a/WebKit/android/jni/JavaSharedClient.cpp b/WebKit/android/jni/JavaSharedClient.cpp
index f115f62..fcccd85 100644
--- a/WebKit/android/jni/JavaSharedClient.cpp
+++ b/WebKit/android/jni/JavaSharedClient.cpp
@@ -25,35 +25,28 @@
 
 #include "config.h"
 #include "JavaSharedClient.h"
-#define LOG_TAG "JavaSharedClient"
-#include "utils/Log.h"
+#include "TimerClient.h"
 #include "SkDeque.h"
 #include "SkThread.h"
 
 namespace android {
-    void AndroidSignalServiceFuncPtrQueue();
-
     TimerClient* JavaSharedClient::GetTimerClient()
     {
-        //LOG_ASSERT(gTimerClient != NULL, "gTimerClient not initialized!!!");
         return gTimerClient;
     }
 
     CookieClient* JavaSharedClient::GetCookieClient()
     {
-        //LOG_ASSERT(gCookieClient != NULL, "gCookieClient not initialized!!!");
         return gCookieClient;
     }
 
     void JavaSharedClient::SetTimerClient(TimerClient* client)
     {
-        //LOG_ASSERT(gTimerClient == NULL || client == NULL, "gTimerClient already set, aborting...");
         gTimerClient = client;
     }
 
     void JavaSharedClient::SetCookieClient(CookieClient* client)
     {
-        //LOG_ASSERT(gCookieClient == NULL || client == NULL, "gCookieClient already set, aborting...");
         gCookieClient = client;
     }
 
@@ -81,7 +74,7 @@ namespace android {
         
         gFuncPtrQMutex.release();
         
-        android::AndroidSignalServiceFuncPtrQueue();
+        gTimerClient->signalServiceFuncPtrQueue();
     }
 
     void JavaSharedClient::ServiceFunctionPtrQueue()