Rewrite PictureSet with TURBO!

This changes how partial invals are done by adding a hybrid mode.

What we used to do is generate a SkPicture for the new area. This
SkPicture would possibly be larger than the actual inval, depending
on various merge rules (more SkPictures == slower to draw a tile)

The new code rewrites PictureSet entirely, preserving many of the old rules
but cleans up the code and adds the concept of a "PrerenderedInval". This is
a partial inval that WebKit has rasterized. By having WebKit produce both
a SkPicture and a SkBitmap, we avoid needing to play back the picture and
avoid overdrawing. We take this SkBitmap, and simply update the front
textures with it. This gives us full partial invals through the entire
system without hitting any driver bugs, and with minimal copies. And while
the SkPicture may be larger than the inval, the SkBitmap that is rasterized
is not - it matches the area webkit has said is dirty.

Change-Id: Ieb7ecc9db0d4f679102fda004a43399f9b319ebc

1 files changed, 11 insertions, 76 deletions

diff --git a/Source/WebCore/platform/graphics/android/rendering/Tile.cpp b/Source/WebCore/platform/graphics/android/rendering/Tile.cpp
index 2ee45b0..3af05f4 100644
--- a/Source/WebCore/platform/graphics/android/rendering/Tile.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/Tile.cpp
@@ -327,75 +327,7 @@ void Tile::paintBitmap(TilePainter* painter)
     const float tileWidth = renderInfo.tileSize.width();
     const float tileHeight = renderInfo.tileSize.height();
 
-    SkRegion::Iterator cliperator(dirtyArea);
-
-    bool fullRepaint = false;
-
-    if (m_fullRepaint
-        || textureInfo->m_width != tileWidth
-        || textureInfo->m_height != tileHeight) {
-        fullRepaint = true;
-    }
-
-    // For now, only do full repaint
-    fullRepaint = true;
-
-    if (!fullRepaint) {
-        // compute the partial inval area
-        SkIRect totalRect;
-        totalRect.set(0, 0, 0, 0);
-        float tileSurface = tileWidth * tileHeight;
-        float tileSurfaceCap = MAX_INVAL_AREA * tileSurface;
-
-        // We join all the invals in the same tile for now
-        while (!fullRepaint && !cliperator.done()) {
-            SkRect realTileRect;
-            SkRect dirtyRect;
-            dirtyRect.set(cliperator.rect());
-            bool intersect = intersectWithRect(x, y, tileWidth, tileHeight,
-                                               scale, dirtyRect, realTileRect);
-            if (intersect) {
-                // initialize finalRealRect to the rounded values of realTileRect
-                SkIRect finalRealRect;
-                realTileRect.roundOut(&finalRealRect);
-
-                // stash the int values of the current width and height
-                const int iWidth = finalRealRect.width();
-                const int iHeight = finalRealRect.height();
-
-                if (iWidth == tileWidth || iHeight == tileHeight) {
-                    fullRepaint = true;
-                    break;
-                }
-
-                // translate the rect into tile space coordinates
-                finalRealRect.fLeft = finalRealRect.fLeft % static_cast<int>(tileWidth);
-                finalRealRect.fTop = finalRealRect.fTop % static_cast<int>(tileHeight);
-                finalRealRect.fRight = finalRealRect.fLeft + iWidth;
-                finalRealRect.fBottom = finalRealRect.fTop + iHeight;
-                totalRect.join(finalRealRect);
-                float repaintSurface = totalRect.width() * totalRect.height();
-
-                if (repaintSurface > tileSurfaceCap) {
-                    fullRepaint = true;
-                    break;
-                }
-            }
-
-            cliperator.next();
-        }
-
-        if (!fullRepaint) {
-            renderInfo.invalRect = &totalRect;
-            m_renderer->renderTiledContent(renderInfo);
-        }
-    }
-
-    // Do a full repaint if needed
-    if (fullRepaint) {
-        renderInfo.invalRect = 0;
-        m_renderer->renderTiledContent(renderInfo);
-    }
+    m_renderer->renderTiledContent(renderInfo);
 
     m_atomicSync.lock();
 
@@ -410,13 +342,7 @@ void Tile::paintBitmap(TilePainter* painter)
         if (m_scale != scale)
             m_dirty = true;
 
-        if (fullRepaint)
-            m_dirtyArea.setEmpty();
-        else
-            m_dirtyArea.op(dirtyArea, SkRegion::kDifference_Op);
-
-        if (!m_dirtyArea.isEmpty())
-            m_dirty = true;
+        m_dirtyArea.setEmpty();
 
         ALOGV("painted tile %p (%d, %d), texture %p, dirty=%d", this, x, y, texture, m_dirty);
 
@@ -498,6 +424,15 @@ void Tile::backTextureTransferFail() {
     // whether validatePaint is called before or after, it won't do anything
 }
 
+void Tile::onBlitUpdate()
+{
+    // The front texture was directly updated with a blit, so mark this as clean
+    android::AutoMutex lock(m_atomicSync);
+    m_dirty = false;
+    m_dirtyArea.setEmpty();
+    m_state = Tile::UpToDate;
+}
+
 void Tile::validatePaint() {
     // ONLY CALL while m_atomicSync is locked (at the end of paintBitmap())