diff options
author | Chris Craik <ccraik@google.com> | 2011-10-19 15:34:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-19 15:34:48 -0700 |
commit | 2e2ffd359fd732f6c99f43cd0bd96c372d33c1f9 (patch) | |
tree | f740988aa3d2056c486b710d9ef7f1b864cbab6d | |
parent | 08a237424ece9d4c9f0f4500947b23c33dbffd76 (diff) | |
parent | 81fab713750af480b451fbd9926b7d76b7017551 (diff) | |
download | external_webkit-2e2ffd359fd732f6c99f43cd0bd96c372d33c1f9.zip external_webkit-2e2ffd359fd732f6c99f43cd0bd96c372d33c1f9.tar.gz external_webkit-2e2ffd359fd732f6c99f43cd0bd96c372d33c1f9.tar.bz2 |
am 81fab713: Merge "Mark tiles dirty when discarded from transfer queue" into ics-mr0
* commit '81fab713750af480b451fbd9926b7d76b7017551':
Mark tiles dirty when discarded from transfer queue
-rw-r--r-- | Source/WebCore/platform/graphics/android/BaseTile.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseTile.cpp b/Source/WebCore/platform/graphics/android/BaseTile.cpp index 05b3a3d..f0b0dd2 100644 --- a/Source/WebCore/platform/graphics/android/BaseTile.cpp +++ b/Source/WebCore/platform/graphics/android/BaseTile.cpp @@ -510,6 +510,8 @@ void BaseTile::discardBackTexture() { m_backTexture->release(this); m_backTexture = 0; } + m_state = Unpainted; + m_dirty = true; } bool BaseTile::swapTexturesIfNeeded() { @@ -548,6 +550,7 @@ void BaseTile::backTextureTransferFail() { // retransferred. android::AutoMutex lock(m_atomicSync); m_state = Unpainted; + m_dirty = true; // whether validatePaint is called before or after, it won't do anything } @@ -563,9 +566,11 @@ void BaseTile::validatePaint() { else if (m_state == TransferredUnvalidated) m_state = ReadyToSwap; else { - // shouldn't have just finished painting in any other state, log XLOG("Note: validated tile %p at %d %d, state wasn't paintingstarted or transferred %d", this, m_x, m_y, m_state); + // failed transferring, in which case mark dirty (since + // paintBitmap() may have cleared m_dirty) + m_dirty = true; } if (m_deferredDirty) { |