From 3ef9d5cc655b8274860b8d15441201d3e621baf5 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Wed, 19 Oct 2011 14:51:45 -0700 Subject: Mark tiles dirty when discarded from transfer queue bug:5409902 Tiles weren't always marked dirty, and could get out of the transfer queue without being marked dirty. Change-Id: Ia0fe71f00f61d7aede8ca7bc4a389ac417906d36 --- Source/WebCore/platform/graphics/android/BaseTile.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/platform/graphics') 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) { -- cgit v1.1