Merge "Minimize tearing for fixed element in single surface mode" into jb-dev

3 files changed, 21 insertions, 6 deletions

diff --git a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
index 5021c57..82af3bf 100644
--- a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
@@ -87,8 +87,20 @@ void BaseLayerAndroid::updatePositionsRecursive(const SkRect& visibleContentRect
     FloatRect clip(0, 0, getWidth(), getHeight());
 
     bool forcePositionCalculation = !m_positionsCalculated;
-    float scale = state() ? state()->scale() : 1.0f;
-    updateGLPositionsAndScale(ident, clip, 1, scale, forcePositionCalculation);
+    float scale = 1.0f;
+    // To minimize tearing in single surface mode, don't update the fixed element
+    // when scrolling. The fixed element will move incorrectly when scrolling,
+    // but its position will be corrected after scrolling.
+    bool disableFixedElemUpdate = false;
+    GLWebViewState* webViewState = state();
+    if (webViewState) {
+        scale = webViewState->scale();
+        disableFixedElemUpdate = webViewState->isScrolling()
+                                 && webViewState->isSingleSurfaceRenderingMode();
+    }
+    updateGLPositionsAndScale(ident, clip, 1, scale, forcePositionCalculation,
+                              disableFixedElemUpdate);
+
     m_positionsCalculated = true;
 }
 
diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
index 906b1c1..293bbbc 100644
--- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
@@ -446,7 +446,8 @@ void LayerAndroid::updateLocalTransformAndClip(const TransformationMatrix& paren
 
 void LayerAndroid::updateGLPositionsAndScale(const TransformationMatrix& parentMatrix,
                                              const FloatRect& clipping, float opacity,
-                                             float scale, bool forceCalculation)
+                                             float scale, bool forceCalculation,
+                                             bool disableFixedElemUpdate)
 {
     m_scale = scale;
 
@@ -457,7 +458,7 @@ void LayerAndroid::updateGLPositionsAndScale(const TransformationMatrix& parentM
     forceCalculation |= isPositionFixed()
         || contentIsScrollable()
         || (m_animations.size() != 0);
-
+    forceCalculation &= !(disableFixedElemUpdate && isPositionFixed());
     if (forceCalculation)
         updateLocalTransformAndClip(parentMatrix, clipping);
 
@@ -488,7 +489,9 @@ void LayerAndroid::updateGLPositionsAndScale(const TransformationMatrix& parentM
         childMatrix.translate(-getSize().width() * 0.5f, -getSize().height() * 0.5f);
     }
     for (int i = 0; i < countChildren(); i++)
-        this->getChild(i)->updateGLPositionsAndScale(childMatrix, drawClip(), opacity, scale, forceCalculation);
+        this->getChild(i)->updateGLPositionsAndScale(childMatrix, drawClip(),
+                                                     opacity, scale, forceCalculation,
+                                                     disableFixedElemUpdate);
 }
 
 bool LayerAndroid::visible() {
diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h
index 936ced0..c56d50a 100644
--- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h
+++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h
@@ -156,7 +156,7 @@ public:
 
     void updateGLPositionsAndScale(const TransformationMatrix& parentMatrix,
                                    const FloatRect& clip, float opacity, float scale,
-                                   bool forceCalculations);
+                                   bool forceCalculations, bool disableFixedElemUpdate);
     void setDrawOpacity(float opacity) { m_drawOpacity = opacity; }
     float drawOpacity() { return m_drawOpacity; }
     bool visible();