Layers implementation in GL.

- add textures management code for layers in TilesManager
- add the layers drawing GL code
- modify BaseLayerAndroid::drawGL() to paint the layers
- modify TexturesGenerator to process layers painting requests
Note: some further refactoring (when getting rid of SkLayer as a base
class) will let us remove some redudant function, e.g.
setAnchorPoint/setAnchorPointZ (bug:3292285)

Change-Id: I3cc88575f331104d45c89e84ba27f3af755aa845

1 files changed, 30 insertions, 0 deletions

diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
index 996b272..040f63e 100644
--- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
@@ -75,6 +75,9 @@ BaseLayerAndroid::BaseLayerAndroid()
 
 BaseLayerAndroid::~BaseLayerAndroid()
 {
+#if USE(ACCELERATED_COMPOSITING)
+    TilesManager::instance()->removeOperationsForBaseLayer(this);
+#endif
     m_content.clear();
 #ifdef DEBUG_COUNT
     gBaseLayerAndroidCount--;
@@ -256,6 +259,33 @@ bool BaseLayerAndroid::drawGL(IntRect& viewRect, SkRect& visibleRect,
 
     ret = drawBasePictureInGL(visibleRect, scale);
 
+    if (countChildren() >= 1) {
+        LayerAndroid* compositedRoot = static_cast<LayerAndroid*>(getChild(0));
+        TransformationMatrix ident;
+        compositedRoot->updateFixedLayersPositions(visibleRect);
+        compositedRoot->updateGLPositions(ident, 1);
+        SkMatrix matrix;
+        matrix.setTranslate(left, top);
+
+        // At this point, the previous LayerAndroid* root has been destroyed,
+        // which will have removed the layers as owners of the textures.
+        // Let's now do a pass to reserve the textures for the current tree;
+        // it will only reserve existing textures, not create them on demand.
+#ifdef DEBUG
+        TilesManager::instance()->printLayersTextures("reserve");
+#endif
+        compositedRoot->reserveGLTextures();
+        // Now that we marked the textures being used, we delete the unnecessary
+        // ones to make space...
+        TilesManager::instance()->cleanupLayersTextures();
+        // Finally do another pass to create new textures if needed
+        compositedRoot->createGLTextures();
+
+        if (compositedRoot->drawGL(matrix))
+            ret = true;
+    }
+    glDisable(GL_SCISSOR_TEST);
+
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     m_previousVisible = visibleRect;