diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-12-29 09:53:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-29 09:53:03 -0800 |
| commit | 6934a5d21817c1fae4d8919e2308be0647f1b4fa (patch) | |
| tree | 09efb2476c34ebf9c1c38e0ac2f5498b1d167764 /WebCore/platform/graphics | |
| parent | 4bea34f0eef8075bbcd898a711b02d74a1d7e675 (diff) | |
| parent | 43f9bc9e74773f2d72db66bd1313269cb1355181 (diff) | |
| download | external_webkit-6934a5d21817c1fae4d8919e2308be0647f1b4fa.zip external_webkit-6934a5d21817c1fae4d8919e2308be0647f1b4fa.tar.gz external_webkit-6934a5d21817c1fae4d8919e2308be0647f1b4fa.tar.bz2 | |
Merge "A WAR to get content showing up when GL enabled"
Diffstat (limited to 'WebCore/platform/graphics')
| -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; |