diff options
| author | Cary Clark <cary@android.com> | 2011-01-06 05:07:46 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-06 05:07:46 -0800 |
| commit | 419a5cf2f8db6ca014df624865197ffb82caad37 (patch) | |
| tree | f70eb43133e5cca9cf1b320a31b84467a5de80b3 /WebCore | |
| parent | ba87d726a9663788c0c5eae2ddb6c3ee24c4a740 (diff) | |
| parent | ca689a9f2e3486d7968848a5fe73554a3fd6c68e (diff) | |
| download | external_webkit-419a5cf2f8db6ca014df624865197ffb82caad37.zip external_webkit-419a5cf2f8db6ca014df624865197ffb82caad37.tar.gz external_webkit-419a5cf2f8db6ca014df624865197ffb82caad37.tar.bz2 | |
Merge "refine empty picture test to look for color rects"
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 6 |
1 files changed, 2 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; |