am b8dbaafe: Merge "Call the right updatePositions*" into jb-dev

* commit 'b8dbaafe072de1d92a3de8d9be6165683a647ace':
  Call the right updatePositions*

2 files changed, 8 insertions, 8 deletions

diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h
index f821d89..79c84b4 100644
--- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h
+++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h
@@ -199,13 +199,6 @@ public:
     void dumpLayers(FILE*, int indentLevel) const;
     void dumpToLog() const;
 
-    /** Call this with the current viewport (scrolling, zoom) to update
-        the position of the fixed layers.
-
-        This call is recursive, so it should be called on the root of the
-        hierarchy.
-    */
-    void updateLayerPositions(SkRect viewPort, IFrameLayerAndroid* parentIframeLayer = 0);
     virtual IFrameLayerAndroid* updatePosition(SkRect viewport,
                                                IFrameLayerAndroid* parentIframeLayer);
 
@@ -297,6 +290,13 @@ public:
     }
 
 protected:
+    /** Call this with the current viewport (scrolling, zoom) to update
+        the position of the fixed layers.
+
+        This call is recursive, so it should be called on the root of the
+        hierarchy.
+    */
+    void updateLayerPositions(SkRect viewPort, IFrameLayerAndroid* parentIframeLayer = 0);
     virtual void onDraw(SkCanvas*, SkScalar opacity, android::DrawExtra* extra, PaintStyle style);
     virtual InvalidateFlags onSetHwAccelerated(bool hwAccelerated) { return InvalidateNone; }
     TransformationMatrix m_drawTransform;
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 38ba451..a67b5fd 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -316,7 +316,7 @@ void draw(SkCanvas* canvas, SkColor bgColor, DrawExtras extras)
 
     // call this to be sure we've adjusted for any scrolling or animations
     // before we actually draw
-    m_baseLayer->updateLayerPositions(m_visibleContentRect);
+    m_baseLayer->updatePositionsRecursive(m_visibleContentRect);
     m_baseLayer->updatePositions();
 
     // We have to set the canvas' matrix on the base layer