diff options
| author | John Reck <jreck@google.com> | 2011-10-24 15:10:04 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-10-25 16:00:41 -0700 |
| commit | 42051e3a21322f4843268b4bc09c85b7e9250d6d (patch) | |
| tree | 08c49b7b51cca26af1587485cf4865eba63b80eb /Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp | |
| parent | f6bfe94d8f2312a226d88c9effc5a400df7a72c4 (diff) | |
| download | external_webkit-42051e3a21322f4843268b4bc09c85b7e9250d6d.zip external_webkit-42051e3a21322f4843268b4bc09c85b7e9250d6d.tar.gz external_webkit-42051e3a21322f4843268b4bc09c85b7e9250d6d.tar.bz2 | |
DO NOT MERGE Fix SW extras for layers
Bug: 5507239
Also remove all the old, unused layer setExtras stuff
Change-Id: Id1670010536712b7a9f50e74821c9fb7f708e851
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 a8c4d7a..15595e4 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) |