diff options
| -rw-r--r-- | WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 6 | ||||
| -rw-r--r-- | WebKit/android/jni/PictureSet.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index fe8150c..1a08b3c 100644 --- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -114,8 +114,7 @@ void BaseLayerAndroid::drawCanvas(SkCanvas* canvas) #if USE(ACCELERATED_COMPOSITING) android::Mutex::Autolock lock(m_drawLock); #endif - // TODO: After the isEmpty check fixed, we can remove the GL dependency here. - if (m_glWebViewState || !m_content.isEmpty()) + if (!m_content.isEmpty()) m_content.draw(canvas); // TODO : replace with !m_extra.isEmpty() once such a call exists if (m_extra.width() > 0) @@ -125,8 +124,7 @@ void BaseLayerAndroid::drawCanvas(SkCanvas* canvas) #if USE(ACCELERATED_COMPOSITING) bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale) { - // TODO: After the isEmpty check fixed, we can remove the GL dependency here. - if (!m_glWebViewState && m_content.isEmpty()) + if (m_content.isEmpty()) return false; if (!m_glWebViewState) return false; diff --git a/WebKit/android/jni/PictureSet.cpp b/WebKit/android/jni/PictureSet.cpp index 55d36b4..98cda23 100644 --- a/WebKit/android/jni/PictureSet.cpp +++ b/WebKit/android/jni/PictureSet.cpp @@ -384,6 +384,8 @@ public: virtual void drawRect(const SkRect& , const SkPaint& paint) { // wait for visual content + if (paint.getColor() != SK_ColorWHITE) + notEmpty(); } virtual void drawSprite(const SkBitmap& , int , int , |