diff options
author | John Reck <jreck@google.com> | 2012-06-12 16:38:32 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 16:38:32 -0700 |
commit | cf0d6ef9f40a29e045713df527462426197c77c1 (patch) | |
tree | ccc243ba7352460e899bc3a3ed8677ffcaaa62d1 /Source/WebCore/platform | |
parent | 9b908d82ee5f24781af175062365988595fa496e (diff) | |
parent | 101ff140ede0e7b633699bdb98bddd25b17b6eb2 (diff) | |
download | external_webkit-cf0d6ef9f40a29e045713df527462426197c77c1.zip external_webkit-cf0d6ef9f40a29e045713df527462426197c77c1.tar.gz external_webkit-cf0d6ef9f40a29e045713df527462426197c77c1.tar.bz2 |
am 101ff140: am b8dbaafe: Merge "Call the right updatePositions*" into jb-dev
* commit '101ff140ede0e7b633699bdb98bddd25b17b6eb2':
Call the right updatePositions*
Diffstat (limited to 'Source/WebCore/platform')
-rw-r--r-- | Source/WebCore/platform/graphics/android/layers/LayerAndroid.h | 14 |
1 files changed, 7 insertions, 7 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; |