1 files changed, 30 insertions, 2 deletions

diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp
index 174720f..9914176 100644
--- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp
@@ -38,6 +38,10 @@ namespace WebCore {
 
 using namespace android::uirenderer;
 
+// Tag used to display current number of SurfaceCollections.
+// Note: this will only work if one webview is actively drawing at a time.
+static const char* COLLECTION_COUNT_TAG = "CollectionCount";
+
 SurfaceCollectionManager::SurfaceCollectionManager()
     : m_drawingCollection(0)
     , m_paintingCollection(0)
@@ -87,6 +91,12 @@ void SurfaceCollectionManager::swap()
     m_paintingCollection = m_queuedCollection;
     m_queuedCollection = 0;
 
+    if (ATRACE_ENABLED()) {
+        ATRACE_INT(COLLECTION_COUNT_TAG,
+                   (m_drawingCollection ? 1 : 0)
+                   + (m_paintingCollection ? 1 : 0));
+    }
+
     ALOGV("SWAPPING COMPLETE, D %p, P %p, Q %p",
          m_drawingCollection, m_paintingCollection, m_queuedCollection);
 }
@@ -106,6 +116,8 @@ void SurfaceCollectionManager::clearCollections()
     m_paintingCollection = 0;
     SkSafeUnref(m_queuedCollection);
     m_queuedCollection = 0;
+
+    ATRACE_INT(COLLECTION_COUNT_TAG, 0);
 }
 
 void SurfaceCollectionManager::updatePaintingCollection(SurfaceCollection* newCollection)
@@ -126,8 +138,10 @@ bool SurfaceCollectionManager::updateWithSurfaceCollection(SurfaceCollection* ne
 
     if (!newCollection || brandNew) {
         clearCollections();
-        if (brandNew)
+        if (brandNew) {
             updatePaintingCollection(newCollection);
+            ATRACE_INT(COLLECTION_COUNT_TAG, 1);
+        }
         return false;
     }
 
@@ -157,6 +171,13 @@ bool SurfaceCollectionManager::updateWithSurfaceCollection(SurfaceCollection* ne
         // don't have painting collection, paint this one!
         updatePaintingCollection(newCollection);
     }
+
+    if (ATRACE_ENABLED()) {
+        ATRACE_INT(COLLECTION_COUNT_TAG,
+                   (m_drawingCollection ? 1 : 0)
+                   + (m_paintingCollection ? 1 : 0)
+                   + (m_queuedCollection ? 1 : 0));
+    }
     return m_drawingCollection && TilesManager::instance()->useDoubleBuffering();
 }
 
@@ -225,18 +246,19 @@ int SurfaceCollectionManager::drawGL(double currentTime, IntRect& viewRect,
     int returnFlags = 0;
 
     bool didCollectionSwap = false;
+    bool tryFastBlit = !m_fastSwapMode;
     if (m_paintingCollection) {
         ALOGV("preparing painting collection %p", m_paintingCollection);
 
         m_paintingCollection->evaluateAnimations(currentTime);
 
-        bool tryFastBlit = !m_fastSwapMode;
         m_paintingCollection->prepareGL(visibleContentRect, tryFastBlit);
         m_paintingCollection->computeTexturesAmount(texturesResultPtr);
 
         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;
@@ -261,6 +283,9 @@ int SurfaceCollectionManager::drawGL(double currentTime, IntRect& viewRect,
                 && m_drawingCollection->isReady())) {
             // either a swap just occurred, or there is no more work to be done: do a full draw
             m_drawingCollection->swapTiles();
+
+            if (didCollectionSwap && m_paintingCollection)
+                m_paintingCollection->prepareGL(visibleContentRect, tryFastBlit);
             returnFlags |= DrawGlInfo::kStatusDraw;
         } else {
             // current collection not ready - invoke functor in process mode
@@ -286,6 +311,9 @@ int SurfaceCollectionManager::drawGL(double currentTime, IntRect& viewRect,
         if (didCollectionSwap || m_fastSwapMode || (drawingReady && !m_paintingCollection))
             m_drawingCollection->swapTiles();
 
+        if (didCollectionSwap && m_paintingCollection)
+            m_paintingCollection->prepareGL(visibleContentRect, tryFastBlit);
+
         if (drawingReady) {
             // exit fast swap mode, as content is up to date
             m_fastSwapMode = false;