summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Victoria Lease <violets@google.com> 2012-03-30 14:45:42 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-03-30 14:45:42 -0700
commit203a46e53b38ff8506825c78384f263f45f13e7f (patch)
tree3de740d660137f1d474c810ab7c104db962a4c4f
parent9c5e144bc0f77669a0eec7d86016d4085ac099a4 (diff)
parent7a52f265434b089a0fb62708b197640a46229144 (diff)
Merge "java-side enable/disable switch for link prefetch via WebSettings"
-rw-r--r--core/java/android/webkit/WebSettingsClassic.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebSettingsClassic.java b/core/java/android/webkit/WebSettingsClassic.java
index c41bc00045b0..94b46fc9bb04 100644
--- a/core/java/android/webkit/WebSettingsClassic.java
+++ b/core/java/android/webkit/WebSettingsClassic.java
@@ -90,6 +90,7 @@ public class WebSettingsClassic extends WebSettings {
private boolean mWorkersEnabled = false; // only affects V8.
private boolean mGeolocationEnabled = true;
private boolean mXSSAuditorEnabled = false;
+ private boolean mLinkPrefetchEnabled = false;
// HTML5 configuration parameters
private long mAppCacheMaxSize = Long.MAX_VALUE;
private String mAppCachePath = null;
@@ -1305,6 +1306,16 @@ public class WebSettingsClassic extends WebSettings {
}
/**
+ * Enables/disables HTML5 link "prefetch" parameter.
+ */
+ public synchronized void setLinkPrefetchEnabled(boolean flag) {
+ if (mLinkPrefetchEnabled != flag) {
+ mLinkPrefetchEnabled = flag;
+ postSync();
+ }
+ }
+
+ /**
* @see android.webkit.WebSettings#getJavaScriptEnabled()
*/
@Override