diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-10-19 16:34:10 -0700 |
|---|---|---|
| committer | Nicolas Roard <nicolas@android.com> | 2010-10-26 11:23:34 -0700 |
| commit | 75394f5ee0aac2337cdff1597b4e686e22c52833 (patch) | |
| tree | 9256c0016ef1647e117077ea0ae59781b64f1f48 /WebCore/platform/graphics/android/GLWebViewState.cpp | |
| parent | f2c1cb6633bade84ccbe4cc4408a7fb7e15c29b8 (diff) | |
| download | external_webkit-75394f5ee0aac2337cdff1597b4e686e22c52833.zip external_webkit-75394f5ee0aac2337cdff1597b4e686e22c52833.tar.gz external_webkit-75394f5ee0aac2337cdff1597b4e686e22c52833.tar.bz2 | |
Fix random crashes when HW acceleration is turned on.
Bug:3107362
Change-Id: I354a07369056e696deed7458a4f4e14d54b7f6c8
Diffstat (limited to 'WebCore/platform/graphics/android/GLWebViewState.cpp')
| -rw-r--r-- | WebCore/platform/graphics/android/GLWebViewState.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/WebCore/platform/graphics/android/GLWebViewState.cpp b/WebCore/platform/graphics/android/GLWebViewState.cpp index bbaed78..1a9b509 100644 --- a/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -132,17 +132,14 @@ void GLWebViewState::resetExtra(bool repaint) m_navLayer = 0; } -bool GLWebViewState::paintBaseLayerContent(SkCanvas* canvas) +void GLWebViewState::paintBaseLayerContent(SkCanvas* canvas) { android::Mutex::Autolock lock(m_baseLayerLock); - if (m_baseLayer && m_baseLayer->content() - && !m_baseLayer->content()->isEmpty()) { - m_baseLayer->content()->draw(canvas); + if (m_baseLayer) { + m_baseLayer->draw(canvas); if (m_extra && m_navLayer) m_extra->draw(canvas, m_navLayer); - return true; } - return false; } void GLWebViewState::scheduleUpdate(const double& currentTime, float scale) |