diff options
| author | Chris Craik <ccraik@google.com> | 2012-04-13 12:52:38 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2012-04-13 13:09:16 -0700 |
| commit | 64d72d82692e48f595e7a31ac2a1680f11d9186b (patch) | |
| tree | aabe87e5c157d02146411f1a76410fbfdd4b32c9 /Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp | |
| parent | 85213faae54abd12e8debbf768235403a22faa03 (diff) | |
| download | external_webkit-64d72d82692e48f595e7a31ac2a1680f11d9186b.zip external_webkit-64d72d82692e48f595e7a31ac2a1680f11d9186b.tar.gz external_webkit-64d72d82692e48f595e7a31ac2a1680f11d9186b.tar.bz2 | |
remove several unneeded variables/parameters
Change-Id: I862487e8700a408e9e2f7f4dc7d034674ac454d0
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp index 8c9cad5..52a8e44 100644 --- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp @@ -36,9 +36,8 @@ namespace WebCore { -SurfaceCollectionManager::SurfaceCollectionManager(GLWebViewState* state) - : m_state(state) - , m_drawingCollection(0) +SurfaceCollectionManager::SurfaceCollectionManager() + : m_drawingCollection(0) , m_paintingCollection(0) , m_queuedCollection(0) , m_fastSwapMode(false) @@ -59,8 +58,6 @@ void SurfaceCollectionManager::swap() // swap can't be called unless painting just finished ASSERT(m_paintingCollection); - android::Mutex::Autolock lock(m_paintSwapLock); - ALOGV("SWAPPING, D %p, P %p, Q %p", m_drawingCollection, m_paintingCollection, m_queuedCollection); @@ -90,8 +87,6 @@ void SurfaceCollectionManager::swap() // clear all of the content in the three collections held by the collection manager void SurfaceCollectionManager::clearCollections() { - ALOGV("SurfaceCollectionManager %p removing PS from state %p", this, m_state); - SkSafeUnref(m_drawingCollection); m_drawingCollection = 0; SkSafeUnref(m_paintingCollection); @@ -109,8 +104,6 @@ bool SurfaceCollectionManager::updateWithSurfaceCollection(SurfaceCollection* ne // can't have a queued collection unless have a painting collection too ASSERT(m_paintingCollection || !m_queuedCollection); - android::Mutex::Autolock lock(m_paintSwapLock); - if (!newCollection || brandNew) { clearCollections(); if (brandNew) { |