diff options
| author | John Reck <jreck@google.com> | 2012-05-29 13:29:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-29 13:29:31 -0700 |
| commit | 97cb93b869e25703d6631b2fd1a6d96048049870 (patch) | |
| tree | 1219aced677447f10f02e90e85e80bd514887d90 /Source | |
| parent | f056a239b53dc3a3979e0e06093db074b86916a7 (diff) | |
| parent | e0c1837650762f7aaeb5be275fbaa93ded0ecd02 (diff) | |
| download | external_webkit-97cb93b869e25703d6631b2fd1a6d96048049870.zip external_webkit-97cb93b869e25703d6631b2fd1a6d96048049870.tar.gz external_webkit-97cb93b869e25703d6631b2fd1a6d96048049870.tar.bz2 | |
am e0c18376: am 6184a1df: Disable copyScrollPosition for iframes
* commit 'e0c1837650762f7aaeb5be275fbaa93ded0ecd02':
Disable copyScrollPosition for iframes
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index ad69042..914d605 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -495,6 +495,9 @@ static void copyScrollPosition(const LayerAndroid* fromRoot, LayerAndroid* to = toRoot->findById(layerId); if (!from || !to || !from->contentIsScrollable() || !to->contentIsScrollable()) return; + // TODO: Support this for iframes. + if (to->isIFrameContent() || from->isIFrameContent()) + return; to->setScrollOffset(from->getScrollOffset()); } #endif |