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/BaseLayerAndroid.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/BaseLayerAndroid.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index 2902b5c..2a1b1de 100644 --- a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -101,14 +101,6 @@ void BaseLayerAndroid::setContent(const PictureSet& src) // setSize(src.width(), src.height()); } -void BaseLayerAndroid::setExtra(SkPicture& src) -{ -#if USE(ACCELERATED_COMPOSITING) - android::Mutex::Autolock lock(m_drawLock); -#endif - m_extra.swap(src); -} - void BaseLayerAndroid::drawCanvas(SkCanvas* canvas) { #if USE(ACCELERATED_COMPOSITING) @@ -116,9 +108,6 @@ void BaseLayerAndroid::drawCanvas(SkCanvas* canvas) #endif if (!m_content.isEmpty()) m_content.draw(canvas); - // TODO : replace with !m_extra.isEmpty() once such a call exists - if (m_extra.width() > 0) - m_extra.draw(canvas); } #if USE(ACCELERATED_COMPOSITING) |