summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport
diff options
context:
space:
mode:
authorGuang Zhu <guangzhu@google.com>2009-05-08 15:54:24 -0700
committerGuang Zhu <guangzhu@google.com>2009-05-08 15:54:24 -0700
commitd15fb80564c4e30b088ca87fa21a03d67675c662 (patch)
tree5f21bd9e0b9baec008da85d4803411245b0866d6 /WebKit/android/WebCoreSupport
parentcaa864796d441dce5dc8a5373e19767af14ab12c (diff)
downloadexternal_webkit-d15fb80564c4e30b088ca87fa21a03d67675c662.zip
external_webkit-d15fb80564c4e30b088ca87fa21a03d67675c662.tar.gz
external_webkit-d15fb80564c4e30b088ca87fa21a03d67675c662.tar.bz2
Added JNI binding for new onJsTimeout callback
Diffstat (limited to 'WebKit/android/WebCoreSupport')
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 714a7d8..7b09975 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -203,7 +203,10 @@ void ChromeClientAndroid::setStatusbarText(const String&) { notImplemented(); }
// Javascript. If true is returned, the script is cancelled.
// To make a device more responsive, we default to return true to disallow long running script.
// This implies that some of scripts will not be completed.
-bool ChromeClientAndroid::shouldInterruptJavaScript() { return true; }
+bool ChromeClientAndroid::shouldInterruptJavaScript() {
+ FrameView* frameView = m_webFrame->page()->mainFrame()->view();
+ return android::WebViewCore::getWebViewCore(frameView)->jsInterrupt();
+}
bool ChromeClientAndroid::tabsToLinks() const { return false; }