diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-11-17 13:20:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 13:20:29 -0800 |
| commit | a3b7e9608a8bb301d3495e35302b6121d127b6ad (patch) | |
| tree | 6794ff8487070421182756ebb70184c429a9c9dc /Source/WebCore/platform/graphics/android/TransferQueue.cpp | |
| parent | ecc9a729169b40aa92aafc472d01470e9f99aadb (diff) | |
| parent | 7fd7178c44ef32d378ec7a1454a84639c4dbcac2 (diff) | |
| download | external_webkit-a3b7e9608a8bb301d3495e35302b6121d127b6ad.zip external_webkit-a3b7e9608a8bb301d3495e35302b6121d127b6ad.tar.gz external_webkit-a3b7e9608a8bb301d3495e35302b6121d127b6ad.tar.bz2 | |
am 7fd7178c: Merge "Add logging to help debug an ANR" into ics-mr1
* commit '7fd7178c44ef32d378ec7a1454a84639c4dbcac2':
Add logging to help debug an ANR
Diffstat (limited to 'Source/WebCore/platform/graphics/android/TransferQueue.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/TransferQueue.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/android/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/TransferQueue.cpp index dd72f0d..afcfb47 100644 --- a/Source/WebCore/platform/graphics/android/TransferQueue.cpp +++ b/Source/WebCore/platform/graphics/android/TransferQueue.cpp @@ -297,8 +297,11 @@ void TransferQueue::updateDirtyBaseTiles() BaseTileTexture* destTexture = 0; if (!obsoleteBaseTile) destTexture = m_transferQueue[index].savedBaseTilePtr->backTexture(); - if (m_transferQueue[index].uploadType == GpuUpload) - m_sharedSurfaceTexture->updateTexImage(); + if (m_transferQueue[index].uploadType == GpuUpload) { + status_t result = m_sharedSurfaceTexture->updateTexImage(); + if (result != OK) + XLOGC("unexpected error: updateTexImage return %d", result); + } m_transferQueue[index].savedBaseTilePtr = 0; m_transferQueue[index].status = emptyItem; if (obsoleteBaseTile) { @@ -491,8 +494,11 @@ void TransferQueue::cleanupTransportQueue() // No matter what the current upload type is, as long as there has // been a Surf Tex enqueue operation, this updateTexImage need to // be called to keep things in sync. - if (m_transferQueue[index].uploadType == GpuUpload) - m_sharedSurfaceTexture->updateTexImage(); + if (m_transferQueue[index].uploadType == GpuUpload) { + status_t result = m_sharedSurfaceTexture->updateTexImage(); + if (result != OK) + XLOGC("unexpected error: updateTexImage return %d", result); + } // since tiles in the queue may be from another webview, remove // their textures so that they will be repainted / retransferred |