Merge "Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work."

3 files changed, 41 insertions, 1 deletions

diff --git a/Source/WebCore/platform/graphics/android/Layer.h b/Source/WebCore/platform/graphics/android/Layer.h
index 24302ce..c8bb81d 100644
--- a/Source/WebCore/platform/graphics/android/Layer.h
+++ b/Source/WebCore/platform/graphics/android/Layer.h
@@ -136,7 +136,6 @@ protected:
 
     bool m_hasOverflowChildren;
 
-private:
     bool isAncestor(const Layer*) const;
 
     Layer* fParent;
diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/LayerAndroid.cpp
index b086c79..4e00a4b 100644
--- a/Source/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -575,6 +575,7 @@ void LayerAndroid::updatePositions()
 void LayerAndroid::updateGLPositionsAndScale(const TransformationMatrix& parentMatrix,
                                              const FloatRect& clipping, float opacity, float scale)
 {
+    m_atomicSync.lock();
     IntSize layerSize(getSize().width(), getSize().height());
     FloatPoint anchorPoint(getAnchorPoint().fX, getAnchorPoint().fY);
     FloatPoint position(getPosition().fX, getPosition().fY);
@@ -593,6 +594,7 @@ void LayerAndroid::updateGLPositionsAndScale(const TransformationMatrix& parentM
                             -originY,
                             -anchorPointZ());
 
+    m_atomicSync.unlock();
     setDrawTransform(localMatrix);
     if (m_drawTransform.isIdentityOrTranslation()) {
         // adjust the translation coordinates of the draw transform matrix so
@@ -762,6 +764,39 @@ void LayerAndroid::assignTextureTo(LayerAndroid* newTree)
     }
 }
 
+bool LayerAndroid::updateWithTree(LayerAndroid* newTree)
+{
+    bool needsRepaint = false;
+    int count = this->countChildren();
+    for (int i = 0; i < count; i++)
+        needsRepaint |= this->getChild(i)->updateWithTree(newTree);
+
+    if (newTree) {
+        LayerAndroid* newLayer = newTree->findById(uniqueId());
+        needsRepaint |= updateWithLayer(newLayer);
+    }
+    return needsRepaint;
+}
+
+bool LayerAndroid::updateWithLayer(LayerAndroid* layer)
+{
+    if (!layer)
+        return true;
+
+    android::AutoMutex lock(m_atomicSync);
+    m_position = layer->m_position;
+    m_anchorPoint = layer->m_anchorPoint;
+    m_size = layer->m_size;
+    m_opacity = layer->m_opacity;
+    m_transform = layer->m_transform;
+
+    if ((m_recordingPicture != layer->m_recordingPicture)
+        || (m_imageRef != layer->m_imageRef))
+        return true;
+
+    return false;
+}
+
 void LayerAndroid::createTexture()
 {
     int count = this->countChildren();
diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.h b/Source/WebCore/platform/graphics/android/LayerAndroid.h
index 90f4e86..cd52937 100644
--- a/Source/WebCore/platform/graphics/android/LayerAndroid.h
+++ b/Source/WebCore/platform/graphics/android/LayerAndroid.h
@@ -276,6 +276,12 @@ public:
     void assignTextureTo(LayerAndroid* newTree);
     void createTexture();
 
+    // Update layers using another tree. Only works for basic properties
+    // such as the position, the transform. Return true if anything more
+    // complex is needed.
+    bool updateWithTree(LayerAndroid*);
+    bool updateWithLayer(LayerAndroid*);
+
     SkBitmapRef* imageRef() { return m_imageRef; }
     ImageTexture* imageTexture() { return m_imageTexture; }
     int type() { return m_type; }