diff options
author | John Reck <jreck@google.com> | 2011-10-25 19:13:24 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-25 19:13:24 -0700 |
commit | f6024a989d5eabfede72f4d156ffc128ed35f5a5 (patch) | |
tree | a68082e5d7c5262bef3ace6f6fc656c1bdb99eae /Source/WebCore/platform/graphics/android/GLWebViewState.cpp | |
parent | c43f9396708d95ecbce1f4ef65530999fab96c0d (diff) | |
parent | 42051e3a21322f4843268b4bc09c85b7e9250d6d (diff) | |
download | external_webkit-f6024a989d5eabfede72f4d156ffc128ed35f5a5.zip external_webkit-f6024a989d5eabfede72f4d156ffc128ed35f5a5.tar.gz external_webkit-f6024a989d5eabfede72f4d156ffc128ed35f5a5.tar.bz2 |
Merge "DO NOT MERGE Fix SW extras for layers" into ics-mr1
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index aa1c05b..e53a1e1 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -147,8 +147,6 @@ void GLWebViewState::setBaseLayer(BaseLayerAndroid* layer, const SkRegion& inval m_baseLayerUpdate = true; m_invalidateRegion.setEmpty(); } - if (m_currentBaseLayer && layer) - m_currentBaseLayer->swapExtra(layer); SkSafeRef(layer); SkSafeUnref(m_currentBaseLayer); |