diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-10-17 11:20:08 -0700 |
|---|---|---|
| committer | Nicolas Roard <nicolasroard@google.com> | 2011-10-17 11:21:38 -0700 |
| commit | 82bf82b7b5fb3c8c2bef17e763a85f55348b8811 (patch) | |
| tree | 919ccc97f9823c895ad84a4e323ef62b8151a8f2 /Source/WebCore/platform/graphics/android/GLWebViewState.cpp | |
| parent | 32ed6f0793dd80c69edf2c7613b58df55ce211f3 (diff) | |
| parent | 7eb15a6b569f79bfddb934615640fd6275218377 (diff) | |
| download | external_webkit-82bf82b7b5fb3c8c2bef17e763a85f55348b8811.zip external_webkit-82bf82b7b5fb3c8c2bef17e763a85f55348b8811.tar.gz external_webkit-82bf82b7b5fb3c8c2bef17e763a85f55348b8811.tar.bz2 | |
resolved conflicts for merge of 7eb15a6b to master
Change-Id: Ibb8a05afcdf79923d8ba105b391fa9dcd2e9deb9
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index fb16c52..bf392578 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -31,6 +31,7 @@ #include "BaseLayerAndroid.h" #include "ClassTracker.h" #include "GLUtils.h" +#include "ImagesManager.h" #include "LayerAndroid.h" #include "SkPath.h" #include "TilesManager.h" @@ -445,6 +446,11 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, // the BaseTiles' texture. TilesManager::instance()->transferQueue()->updateDirtyBaseTiles(); + // Upload any pending ImageTexture + // Return true if we still have some images to upload. + // TODO: upload as many textures as possible within a certain time limit + bool ret = ImagesManager::instance()->uploadTextures(); + if (scale < MIN_SCALE_WARNING || scale > MAX_SCALE_WARNING) { XLOGC("WARNING, scale seems corrupted after update: %e", scale); CRASH(); @@ -459,7 +465,7 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, // set up zoom manager, shaders, etc. m_backgroundColor = baseLayer->getBackgroundColor(); double currentTime = setupDrawing(rect, viewport, webViewRect, titleBarHeight, clip, scale); - bool ret = baseLayer->drawGL(currentTime, compositedRoot, rect, + ret |= baseLayer->drawGL(currentTime, compositedRoot, rect, viewport, scale, buffersSwappedPtr); m_glExtras.drawGL(webViewRect, viewport, titleBarHeight); |