am 00d524fd: Merge "Change the default webView behavior to minimize the memory consumption" into ics-mr1

* commit '00d524fd5dc3e995e2b517da48e479694260ce2f':
  Change the default webView behavior to minimize the memory consumption

1 files changed, 6 insertions, 2 deletions

diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 64d7bbd..60bdd3e 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -2578,16 +2578,20 @@ static bool nativeSetProperty(JNIEnv *env, jobject obj, jstring jkey, jstring jv
             TilesManager::instance()->setInvertedScreen(false);
         return true;
     }
-    if (key == "inverted_contrast") {
+    else if (key == "inverted_contrast") {
         float contrast = value.toFloat();
         TilesManager::instance()->setInvertedScreenContrast(contrast);
         return true;
     }
-    if (key == "enable_cpu_upload_path") {
+    else if (key == "enable_cpu_upload_path") {
         TilesManager::instance()->transferQueue()->setTextureUploadType(
             value == "true" ? CpuUpload : GpuUpload);
         return true;
     }
+    else if (key == "use_minimal_memory") {
+        TilesManager::instance()->setUseMinimalMemory(value == "true");
+        return true;
+    }
     return false;
 }