am 81fab713: Merge "Mark tiles dirty when discarded from transfer queue" into ics-mr0

* commit '81fab713750af480b451fbd9926b7d76b7017551':
  Mark tiles dirty when discarded from transfer queue

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) {