diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-08-18 15:45:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-18 15:45:30 -0700 |
| commit | 55488a4e70941dc7d313c02041395e9a75d8b150 (patch) | |
| tree | a5c44baddaef9d199d2d07655fb7756755fd11fa /Source/WebKit | |
| parent | 8cbca62bcdf31ac48f0083e2e0624b05ce239393 (diff) | |
| parent | f1ab740d0427ebb5c42b8b72fa3102b037a109f0 (diff) | |
| download | external_webkit-55488a4e70941dc7d313c02041395e9a75d8b150.zip external_webkit-55488a4e70941dc7d313c02041395e9a75d8b150.tar.gz external_webkit-55488a4e70941dc7d313c02041395e9a75d8b150.tar.bz2 | |
Merge "Fix repaint when we toggle the inverted mode - add a boolean return in WebView::nativeSetProperty() - add an inverted flag in BaseTileTexture"
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 95c560d..4b18b62 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -2517,7 +2517,7 @@ static void dumpToFile(const char text[], void* file) { } #endif -static void nativeSetProperty(JNIEnv *env, jobject obj, jstring jkey, jstring jvalue) +static bool nativeSetProperty(JNIEnv *env, jobject obj, jstring jkey, jstring jvalue) { WTF::String key = jstringToWtfString(env, jkey); WTF::String value = jstringToWtfString(env, jvalue); @@ -2526,11 +2526,14 @@ static void nativeSetProperty(JNIEnv *env, jobject obj, jstring jkey, jstring jv TilesManager::instance()->setInvertedScreen(true); else TilesManager::instance()->setInvertedScreen(false); + return true; } if (key == "inverted_contrast") { float contrast = value.toFloat(); TilesManager::instance()->setInvertedScreenContrast(contrast); + return true; } + return false; } static jstring nativeGetProperty(JNIEnv *env, jobject obj, jstring key) @@ -2826,7 +2829,7 @@ static JNINativeMethod gJavaWebViewMethods[] = { (void*) nativeUseHardwareAccelSkia }, { "nativeGetBackgroundColor", "()I", (void*) nativeGetBackgroundColor }, - { "nativeSetProperty", "(Ljava/lang/String;Ljava/lang/String;)V", + { "nativeSetProperty", "(Ljava/lang/String;Ljava/lang/String;)Z", (void*) nativeSetProperty }, { "nativeGetProperty", "(Ljava/lang/String;)Ljava/lang/String;", (void*) nativeGetProperty }, |