diff options
author | Chris Craik <ccraik@google.com> | 2011-07-28 11:32:08 -0700 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2011-07-28 13:27:01 -0700 |
commit | 96eef4d75f8a709cc252a69c4e8cb5bd4251187e (patch) | |
tree | 08d0384ef4b09ca1391d414b1463c7df4e5163b4 /Source/WebCore/platform/graphics/android/GLWebViewState.cpp | |
parent | 14a561b2c1a0d30c36751ea756c773d70c9c4d76 (diff) | |
download | external_webkit-96eef4d75f8a709cc252a69c4e8cb5bd4251187e.zip external_webkit-96eef4d75f8a709cc252a69c4e8cb5bd4251187e.tar.gz external_webkit-96eef4d75f8a709cc252a69c4e8cb5bd4251187e.tar.bz2 |
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
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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; |