From 96eef4d75f8a709cc252a69c4e8cb5bd4251187e Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Thu, 28 Jul 2011 11:32:08 -0700 Subject: added pageswap callback from drawGL to WebView bug:5008210 When setting a new base layer, WebView can signal that it wants to have it's pageSwapCallback triggered. This is only done upon request, currently whenever the WebTextView is being displayed so that it can be repositioned upon pageswap. Depends on the following frameworks/base change: https://android-git.corp.google.com/g/#change,124607 Change-Id: Id99c2d5a15cdb4317802a92cedae16a9e0aebc8d --- Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp') diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index 2e379bc..07dda03 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -501,7 +501,8 @@ void GLWebViewState::resetLayersDirtyArea() bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, IntRect& webViewRect, int titleBarHeight, - IntRect& clip, float scale, SkColor color) + IntRect& clip, float scale, bool* pagesSwapped, + SkColor color) { glFinish(); TilesManager::instance()->registerGLWebViewState(this); @@ -548,7 +549,8 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, TilesManager::instance()->cleanupTilesTextures(); } - bool ret = baseLayer->drawGL(compositedRoot, rect, viewport, webViewRect, titleBarHeight, clip, scale, color); + bool ret = baseLayer->drawGL(compositedRoot, rect, viewport, webViewRect, + titleBarHeight, clip, scale, pagesSwapped, color); SkSafeRef(compositedRoot); SkSafeUnref(m_previouslyUsedRoot); m_previouslyUsedRoot = compositedRoot; -- cgit v1.1