diff options
Diffstat (limited to 'WebKit/android/nav')
| -rw-r--r-- | WebKit/android/nav/CachedLayer.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/WebKit/android/nav/CachedLayer.cpp b/WebKit/android/nav/CachedLayer.cpp index f28da2b..dd64f05 100644 --- a/WebKit/android/nav/CachedLayer.cpp +++ b/WebKit/android/nav/CachedLayer.cpp @@ -46,7 +46,7 @@ IntRect CachedLayer::adjustBounds(const LayerAndroid* root, return bounds; } FloatRect temp = bounds; - const FloatPoint& position = aLayer->position(); + const FloatPoint& position = aLayer->getPosition(); temp.move(position.x(), position.y()); const FloatPoint& translation = aLayer->translation(); temp.move(translation.x(), translation.y()); diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index bba6a1e..c64d36a 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -561,9 +561,10 @@ CachedRoot* getFrameCache(FrameCachePermission allowNewer) SkRect viewMetrics; getViewMetrics(&viewMetrics); LayerAndroid* layer = const_cast<LayerAndroid*>( - m_frameCacheUI->rootLayer()->findById(layerId)); - if (layer) - layer->updatePosition(viewMetrics); + m_frameCacheUI->rootLayer()); + if (layer) { + layer->updatePositions(viewMetrics); + } } #endif fixCursor(); @@ -1462,7 +1463,10 @@ static void nativeDrawLayers(JNIEnv *env, jobject obj, jint layer, jobject canv) SkRect viewMetrics; view->getViewMetrics(&viewMetrics); layerImpl->setFindOnPage(view->findOnPage()); - layerImpl->draw(canvas, SK_Scalar1, &viewMetrics); + // call this to be sure we've adjusted for any scrolling or animations + // before we actually draw + layerImpl->updatePositions(viewMetrics); + layerImpl->draw(canvas); #endif } |