3 files changed, 9 insertions, 9 deletions
diff --git a/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
index b91a5d8..c04600d 100644
--- a/WebKit/android/WebCoreSupport/PlatformBridge.cpp
+++ b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
@@ -113,9 +113,10 @@ NPObject* PlatformBridge::pluginScriptableObject(Widget* widget)
 #endif
 }
 
-bool PlatformBridge::isWebViewPaused()
+bool PlatformBridge::isWebViewPaused(const WebCore::FrameView* frameView)
 {
-    return WebViewCore::isPaused();
+    android::WebViewCore* webViewCore = android::WebViewCore::getWebViewCore(frameView);
+    return webViewCore->isPaused();
 }
 
 bool PlatformBridge::popupsAllowed(NPP)
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 4385f4d..0c37380 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -150,8 +150,6 @@ FILE* gRenderTreeFile = 0;
 
 namespace android {
 
-bool WebViewCore::s_isPaused = false;
-
 static SkTDArray<WebViewCore*> gInstanceList;
 
 void WebViewCore::addInstance(WebViewCore* inst) {
@@ -273,6 +271,7 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
 #if ENABLE(TOUCH_EVENTS)
     m_forwardingTouchEvents = false;
 #endif
+    m_isPaused = false;
 
     LOG_ASSERT(m_mainFrame, "Uh oh, somehow a frameview was made without an initial frame!");
 
@@ -2965,7 +2964,7 @@ static void Pause(JNIEnv* env, jobject obj)
     event.data.lifecycle.action = kPause_ANPLifecycleAction;
     GET_NATIVE_VIEW(env, obj)->sendPluginEvent(event);
 
-    WebViewCore::setIsPaused(true);
+    GET_NATIVE_VIEW(env, obj)->setIsPaused(true);
 }
 
 static void Resume(JNIEnv* env, jobject obj)
@@ -2982,7 +2981,7 @@ static void Resume(JNIEnv* env, jobject obj)
     event.data.lifecycle.action = kResume_ANPLifecycleAction;
     GET_NATIVE_VIEW(env, obj)->sendPluginEvent(event);
 
-    WebViewCore::setIsPaused(false);
+    GET_NATIVE_VIEW(env, obj)->setIsPaused(false);
 }
 
 static void FreeMemory(JNIEnv* env, jobject obj)
diff --git a/WebKit/android/jni/WebViewCore.h b/WebKit/android/jni/WebViewCore.h
index 3085a49..fc5ffc7 100644
--- a/WebKit/android/jni/WebViewCore.h
+++ b/WebKit/android/jni/WebViewCore.h
@@ -462,8 +462,8 @@ namespace android {
         // field safely from our respective threads
         static Mutex gButtonMutex;
         WTF::Vector<Container> m_buttons;
-        static bool isPaused() { return s_isPaused; }
-        static void setIsPaused(bool isPaused) { s_isPaused = isPaused; }
+        bool isPaused() const { return m_isPaused; }
+        void setIsPaused(bool isPaused) { m_isPaused = isPaused; }
         // end of shared members
 
         // internal functions
@@ -520,7 +520,7 @@ namespace android {
         unsigned m_domtree_version;
         bool m_check_domtree_version;
         PageGroup* m_groupForVisitedLinks;
-        static bool s_isPaused;
+        bool m_isPaused;
 
         SkTDArray<PluginWidgetAndroid*> m_plugins;
         WebCore::Timer<WebViewCore> m_pluginInvalTimer;