summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-02-18 11:26:48 +0000
committerSteve Block <steveblock@google.com>2010-02-18 12:17:02 +0000
commit930792dfdde9ad0fac3251ab70eb00d97f2fe88d (patch)
tree034286e22e38d273d2bba3dad8983fdea9a2f77f /WebKit/android/WebCoreSupport
parent2e837c8b6511f85209518f832e340662218eb3dc (diff)
downloadexternal_webkit-930792dfdde9ad0fac3251ab70eb00d97f2fe88d.zip
external_webkit-930792dfdde9ad0fac3251ab70eb00d97f2fe88d.tar.gz
external_webkit-930792dfdde9ad0fac3251ab70eb00d97f2fe88d.tar.bz2
Fixes a bug with the Geolocation suspend/resume behaviour
PlatformBridge::isWebViewPaused needs to be an instance method, rather than a static. This fixes a bug where if the user switches browser windows while a page that uses Geolocation is still loading, the Geolocation service won't be started in the suspended state. Note that this is a temporary fix, as the upstreaming of the existing suspend/resume code will introduce a new approach, which will avoid this problem altogether. See https://android-git.corp.google.com/g/#change,38942 Change-Id: I3f07f8837b8a8c1c5e7e4f5112ab487188670c3a
Diffstat (limited to 'WebKit/android/WebCoreSupport')
-rw-r--r--WebKit/android/WebCoreSupport/PlatformBridge.cpp5
1 files changed, 3 insertions, 2 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)