From 27928248689bbdd6c1e12107345427d2ecbd9257 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Mon, 20 Aug 2012 14:20:00 -0700 Subject: Exit fast tile swap mode immediately upon SurfaceCollection swap bug:7002755 This prevents the SurfaceCollectionManager from getting stuck in fast swap mode, where because swaps are occuring in process mode, and not in draw mode, which would previously have prevented the flag from being cleared. Change-Id: Ie888438c73aabeeff0534caad68b58e4acd2c440 --- .../platform/graphics/android/rendering/SurfaceCollectionManager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp index 1270498..9914176 100644 --- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp @@ -258,6 +258,7 @@ int SurfaceCollectionManager::drawGL(double currentTime, IntRect& viewRect, if (!TilesManager::instance()->useDoubleBuffering() || m_paintingCollection->isReady()) { ALOGV("have painting collection %p ready, swapping!", m_paintingCollection); didCollectionSwap = true; + m_fastSwapMode = false; TilesManager::instance()->incContentUpdates(); if (collectionsSwappedPtr) *collectionsSwappedPtr = true; -- cgit v1.1