diff options
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 4 | ||||
| -rw-r--r-- | WebKit/android/jni/WebSettings.cpp | 4 | ||||
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index ffa96f8..9b0e7b4 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -71,8 +71,10 @@ void ChromeClientAndroid::compositingLayerSync() frameView->syncCompositingStateRecursive(); GraphicsLayerAndroid* androidGraphicsLayer = static_cast<GraphicsLayerAndroid*>(m_rootGraphicsLayer); - if (androidGraphicsLayer) + if (androidGraphicsLayer) { androidGraphicsLayer->sendImmediateRepaint(); + androidGraphicsLayer->notifyClientAnimationStarted(); + } return; } } diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp index 00fec85..50919b6 100644 --- a/WebKit/android/jni/WebSettings.cpp +++ b/WebKit/android/jni/WebSettings.cpp @@ -35,8 +35,8 @@ #include "Frame.h" #include "FrameLoader.h" #include "FrameView.h" -#include "Geolocation.h" #include "GeolocationPermissions.h" +#include "GeolocationPositionCache.h" #include "Page.h" #include "PageCache.h" #include "RenderTable.h" @@ -366,7 +366,7 @@ public: str = (jstring)env->GetObjectField(obj, gFieldIds->mGeolocationDatabasePath); if (str) { GeolocationPermissions::setDatabasePath(to_string(env,str)); - WebCore::Geolocation::setDatabasePath(to_string(env,str)); + WebCore::GeolocationPositionCache::setDatabasePath(to_string(env,str)); } size = env->GetIntField(obj, gFieldIds->mPageCacheCapacity); diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index dae93fc..e2a7708 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -1533,13 +1533,10 @@ static void nativeDrawLayers(JNIEnv *env, jobject obj, #endif } -static void nativeUpdateLayers(JNIEnv *env, jobject obj, - jint layer, jint updates) +static void nativeUpdateLayers(JNIEnv *env, jobject obj, jint updates) { if (!env) return; - if (!layer) - return; if (!updates) return; @@ -2138,7 +2135,7 @@ static JNINativeMethod gJavaWebViewMethods[] = { (void*) nativeEvaluateLayersAnimations }, { "nativeDrawLayers", "(IIIIIFLandroid/graphics/Canvas;)V", (void*) nativeDrawLayers }, - { "nativeUpdateLayers", "(II)V", + { "nativeUpdateLayers", "(I)V", (void*) nativeUpdateLayers }, { "nativeDrawMatches", "(Landroid/graphics/Canvas;)V", (void*) nativeDrawMatches }, |