summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2011-08-18 15:45:27 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-18 15:45:27 -0700
commitfc8f2ca6216181e95e30ad96be842e0b12b3d46d (patch)
tree57851df20d478f78556a3e09e05097b7faf0414c /core/java/android
parentb7f4d117d201f21a705f576be0687610aa6fd842 (diff)
parent872cf224f30c8d083f1f8f14633fa029c9d3866b (diff)
downloadframeworks_base-fc8f2ca6216181e95e30ad96be842e0b12b3d46d.zip
frameworks_base-fc8f2ca6216181e95e30ad96be842e0b12b3d46d.tar.gz
frameworks_base-fc8f2ca6216181e95e30ad96be842e0b12b3d46d.tar.bz2
Merge "Modify nativeSetProperty to return a boolean indicating if we need to invalidate the content or not."
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/webkit/WebSettings.java4
-rw-r--r--core/java/android/webkit/WebView.java2
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 642aa22..77f6776 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -1807,7 +1807,9 @@ public class WebSettings {
* @hide
*/
public void setProperty(String key, String value) {
- mWebView.nativeSetProperty(key, value);
+ if (mWebView.nativeSetProperty(key, value)) {
+ mWebView.contentInvalidateAll();
+ }
}
/**
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 17dfbe0..5d776fd 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -9278,6 +9278,6 @@ public class WebView extends AbsoluteLayout
*/
private native boolean nativeScrollLayer(int layer, int newX, int newY);
private native int nativeGetBackgroundColor();
- native void nativeSetProperty(String key, String value);
+ native boolean nativeSetProperty(String key, String value);
native String nativeGetProperty(String key);
}