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/WebKit/android/nav | |
| 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/WebKit/android/nav')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 8b6d5f0..0e4bf32 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 |