diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-11-07 15:53:51 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-07 15:53:51 -0800 |
| commit | 00d524fd5dc3e995e2b517da48e479694260ce2f (patch) | |
| tree | 1f5980dea30a1412aedab84f560902467d08e06d /Source/WebKit/android/nav/WebView.cpp | |
| parent | 82ccbd8ce95211b4b5afad6a653462fd3beb771b (diff) | |
| parent | 8852b0905b1a50ca045eb4bd19b2589aad663b5c (diff) | |
| download | external_webkit-00d524fd5dc3e995e2b517da48e479694260ce2f.zip external_webkit-00d524fd5dc3e995e2b517da48e479694260ce2f.tar.gz external_webkit-00d524fd5dc3e995e2b517da48e479694260ce2f.tar.bz2 | |
Merge "Change the default webView behavior to minimize the memory consumption" into ics-mr1
Diffstat (limited to 'Source/WebKit/android/nav/WebView.cpp')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 8 |
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; } |