summaryrefslogtreecommitdiffstats
path: root/WebKit/android/nav/CachedRoot.h
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2010-08-16 09:40:57 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-16 09:40:57 -0700
commit96b9354838038389fdab0383662e91575e3daa6c (patch)
tree798b195792b6e077c86f0831a6d35d65355b6e0f /WebKit/android/nav/CachedRoot.h
parent9a8d8723cd9c45c526a7c46d1e7d343e50e4e119 (diff)
parent726264480d16a18c02f405aff63a32ba06fb0476 (diff)
downloadexternal_webkit-96b9354838038389fdab0383662e91575e3daa6c.zip
external_webkit-96b9354838038389fdab0383662e91575e3daa6c.tar.gz
external_webkit-96b9354838038389fdab0383662e91575e3daa6c.tar.bz2
Merge "Update navigation in scrollable layers."
Diffstat (limited to 'WebKit/android/nav/CachedRoot.h')
-rw-r--r--WebKit/android/nav/CachedRoot.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/android/nav/CachedRoot.h b/WebKit/android/nav/CachedRoot.h
index 2853241..a6420f9 100644
--- a/WebKit/android/nav/CachedRoot.h
+++ b/WebKit/android/nav/CachedRoot.h
@@ -96,7 +96,10 @@ public:
void setTextGeneration(int textGeneration) { mTextGeneration = textGeneration; }
void setMaxScroll(int x, int y) { mMaxXScroll = x; mMaxYScroll = y; }
void setPicture(SkPicture* picture) { mPicture = picture; }
- void setRootLayer(WebCore::LayerAndroid* layer) { mRootLayer = layer; }
+ void setRootLayer(WebCore::LayerAndroid* layer) {
+ mRootLayer = layer;
+ resetLayers();
+ }
void setScrollOnly(bool state) { mScrollOnly = state; }
void setSelection(int start, int end) { mSelectionStart = start; mSelectionEnd = end; }
void setupScrolledBounds() const { mScrolledBounds = mViewBounds; }