summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-02-28 17:20:32 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-28 17:20:32 -0800
commit0aa65f94b471566ce9c541f604caae9deb189c02 (patch)
tree5ba2c3c5531760c6f4fe391b5742f7876ce8d048 /Source/WebKit
parent7c9401fdc1f052f3e98bac0bef7b24ac743251e5 (diff)
parentd8be9016b7fda67a91b4ee17b3b2e7ba692ee553 (diff)
downloadexternal_webkit-0aa65f94b471566ce9c541f604caae9deb189c02.zip
external_webkit-0aa65f94b471566ce9c541f604caae9deb189c02.tar.gz
external_webkit-0aa65f94b471566ce9c541f604caae9deb189c02.tar.bz2
Merge "layer rendering cleanup/rewrite"
Diffstat (limited to 'Source/WebKit')
-rw-r--r--Source/WebKit/android/nav/WebView.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 132ed98..09b6c3d 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -1394,7 +1394,7 @@ static bool nativeSetProperty(JNIEnv *env, jobject obj, jstring jkey, jstring jv
return true;
}
else if (key == "tree_updates") {
- TilesManager::instance()->clearTreeUpdates();
+ TilesManager::instance()->clearContentUpdates();
return true;
}
return false;
@@ -1404,7 +1404,7 @@ static jstring nativeGetProperty(JNIEnv *env, jobject obj, jstring jkey)
{
WTF::String key = jstringToWtfString(env, jkey);
if (key == "tree_updates") {
- int updates = TilesManager::instance()->getTreeUpdates();
+ int updates = TilesManager::instance()->getContentUpdates();
WTF::String wtfUpdates = WTF::String::number(updates);
return wtfStringToJstring(env, wtfUpdates);
}