summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/nav
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-05-29 10:11:26 -0700
committerJohn Reck <jreck@google.com>2012-05-29 10:11:26 -0700
commit6184a1dfef36741a1e5602f5bf24ac99fcfa0aec (patch)
tree014a3d9e6d2b97f49711d1fce72cbe1912eff456 /Source/WebKit/android/nav
parent86ba073431c8ddf2e9d1f2d5d4f89157dd32ec33 (diff)
downloadexternal_webkit-6184a1dfef36741a1e5602f5bf24ac99fcfa0aec.zip
external_webkit-6184a1dfef36741a1e5602f5bf24ac99fcfa0aec.tar.gz
external_webkit-6184a1dfef36741a1e5602f5bf24ac99fcfa0aec.tar.bz2
Disable copyScrollPosition for iframes
Bug: 6557664 For now simply disable copyScrollPosition for iframes. They may jitter slightly if webkit does a tree sync while scrolling, but the copying isn't trivial due to the nature of iframe scrolling Change-Id: I816fe96b452794b3289c3a522a11447c057e9c5e
Diffstat (limited to 'Source/WebKit/android/nav')
-rw-r--r--Source/WebKit/android/nav/WebView.cpp3
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