summaryrefslogtreecommitdiffstats
path: root/android_webview/java
diff options
context:
space:
mode:
authorkristianm@chromium.org <kristianm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-12 07:22:47 +0000
committerkristianm@chromium.org <kristianm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-12 07:22:47 +0000
commit4436338f8e182423048f3bd31c46e42d35161b26 (patch)
treeebd2f9b93a9f5455f5b8a0618401bdbb5f016dbf /android_webview/java
parent910334c2b6fc0a2f5edaacb15170ea51977fa555 (diff)
downloadchromium_src-4436338f8e182423048f3bd31c46e42d35161b26.zip
chromium_src-4436338f8e182423048f3bd31c46e42d35161b26.tar.gz
chromium_src-4436338f8e182423048f3bd31c46e42d35161b26.tar.bz2
Implementing pauseTimers for chromium webview
Moving this into content/ so it can be used by android_webview. After landing will remove the downstream uses of the chrome/ implementation and later remove the chrome/ implementation. BUG= Review URL: https://chromiumcodereview.appspot.com/12374099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/java')
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java16
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwContents.java7
2 files changed, 21 insertions, 2 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
index b860687..6cfea36 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
@@ -6,6 +6,8 @@ package org.chromium.android_webview;
import android.content.SharedPreferences;
+import org.chromium.content.browser.ContentViewStatics;
+
/**
* Java side of the Browser Context: contains all the java side objects needed to host one
* browing session (i.e. profile).
@@ -39,4 +41,18 @@ public class AwBrowserContext {
}
return mCookieManager;
}
+
+ /**
+ * @see android.webkit.WebView#pauseTimers()
+ */
+ public void pauseTimers() {
+ ContentViewStatics.setWebKitSharedTimersSuspended(true);
+ }
+
+ /**
+ * @see android.webkit.WebView#resumeTimers()
+ */
+ public void resumeTimers() {
+ ContentViewStatics.setWebKitSharedTimersSuspended(false);
+ }
} \ No newline at end of file
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 01927a9..b82efc9 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -34,6 +34,7 @@ import org.chromium.base.ThreadUtils;
import org.chromium.content.browser.ContentSettings;
import org.chromium.content.browser.ContentVideoView;
import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content.browser.ContentViewStatics;
import org.chromium.content.browser.LoadUrlParams;
import org.chromium.content.browser.NavigationHistory;
import org.chromium.content.browser.PageTransitionTypes;
@@ -652,15 +653,17 @@ public class AwContents {
/**
* @see android.webkit.WebView#pauseTimers()
*/
+ // TODO(kristianm): Remove
public void pauseTimers() {
- mContentViewCore.onActivityPause();
+ ContentViewStatics.setWebKitSharedTimersSuspended(true);
}
/**
* @see android.webkit.WebView#resumeTimers()
*/
+ // TODO(kristianm): Remove
public void resumeTimers() {
- mContentViewCore.onActivityResume();
+ ContentViewStatics.setWebKitSharedTimersSuspended(false);
}
/**