diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-12-28 15:27:13 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-12-28 15:27:13 -0800 |
| commit | 43f9bc9e74773f2d72db66bd1313269cb1355181 (patch) | |
| tree | 4fbfc58e757f71ac06b09c067e1275f2b1fc3cea /WebCore/platform/graphics/android/BaseLayerAndroid.cpp | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-43f9bc9e74773f2d72db66bd1313269cb1355181.zip external_webkit-43f9bc9e74773f2d72db66bd1313269cb1355181.tar.gz external_webkit-43f9bc9e74773f2d72db66bd1313269cb1355181.tar.bz2 | |
A WAR to get content showing up when GL enabled
The emptiness check is not optimal for GL rendering yet.
That cause some content are not showing up when GL enabled.
A WAR is to just update the textures and use them without
emptiness check.
bug: 3296986
Change-Id: I5087dbc34b744ffbe24f4a4a6616f4d5715e1f11
Diffstat (limited to 'WebCore/platform/graphics/android/BaseLayerAndroid.cpp')
| -rw-r--r-- | WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index 1a08b3c..fe8150c 100644 --- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -114,7 +114,8 @@ void BaseLayerAndroid::drawCanvas(SkCanvas* canvas) #if USE(ACCELERATED_COMPOSITING) android::Mutex::Autolock lock(m_drawLock); #endif - if (!m_content.isEmpty()) + // TODO: After the isEmpty check fixed, we can remove the GL dependency here. + if (m_glWebViewState || !m_content.isEmpty()) m_content.draw(canvas); // TODO : replace with !m_extra.isEmpty() once such a call exists if (m_extra.width() > 0) @@ -124,7 +125,8 @@ void BaseLayerAndroid::drawCanvas(SkCanvas* canvas) #if USE(ACCELERATED_COMPOSITING) bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale) { - if (m_content.isEmpty()) + // TODO: After the isEmpty check fixed, we can remove the GL dependency here. + if (!m_glWebViewState && m_content.isEmpty()) return false; if (!m_glWebViewState) return false; |