Permalink
Browse files

Merge "Call the right updatePositions*" into jb-dev

  • Loading branch information...
2 parents 9b2be71 + f8a89ea commit b8dbaafe072de1d92a3de8d9be6165683a647ace John Reck committed with Android (Google) Code Review Jun 12, 2012
@@ -199,13 +199,6 @@ class TEST_EXPORT LayerAndroid : public Layer {
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 @@ class TEST_EXPORT LayerAndroid : public Layer {
}
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;
@@ -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

0 comments on commit b8dbaaf

Please sign in to comment.