diff options
| author | Chris Craik <ccraik@google.com> | 2011-10-20 11:34:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-20 11:34:28 -0700 |
| commit | 4c3a209f7fe5d15e4cfbe8f82c0a057e5682cd7c (patch) | |
| tree | 30f12c491a52927daad38c5df24be915d6e99c1e | |
| parent | bb69a7f55a98c757dd11b672c43dae435eccdd0a (diff) | |
| parent | 458b4b11924c3bcc70dcdd3d69f64a855870e72d (diff) | |
| download | external_webkit-4c3a209f7fe5d15e4cfbe8f82c0a057e5682cd7c.zip external_webkit-4c3a209f7fe5d15e4cfbe8f82c0a057e5682cd7c.tar.gz external_webkit-4c3a209f7fe5d15e4cfbe8f82c0a057e5682cd7c.tar.bz2 | |
am 458b4b11: Mark tiles dirty, even if repainting
* commit '458b4b11924c3bcc70dcdd3d69f64a855870e72d':
Mark tiles dirty, even if repainting
| -rw-r--r-- | Source/WebCore/platform/graphics/android/BaseTile.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseTile.cpp b/Source/WebCore/platform/graphics/android/BaseTile.cpp index f0b0dd2..98eb623 100644 --- a/Source/WebCore/platform/graphics/android/BaseTile.cpp +++ b/Source/WebCore/platform/graphics/android/BaseTile.cpp @@ -190,13 +190,14 @@ void BaseTile::markAsDirty(int unsigned pictureCount, // current paint m_state = Unpainted; } else if (m_state != Unpainted) { - // layer tiles and prefetch page tiles are potentially marked dirty - // while in the process of painting, due to not using an update lock - // TODO: fix it so that they can paint while deferring the markAsDirty // call (or block updates) XLOG("Warning: tried to mark tile %p at %d, %d islayertile %d as dirty, state %d, page %p", this, m_x, m_y, isLayerTile(), m_state, m_page); + + // prefetch tiles can be marked dirty while in the process of painting, + // due to not using an update lock. force them to fail validate step. + m_state = Unpainted; } } |