summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shimeng (Simon) Wang <swang@google.com> 2011-01-10 14:30:20 -0800
committer Shimeng (Simon) Wang <swang@google.com> 2011-01-11 09:56:35 -0800
commiteafbce55714dbd1f89fe8c131d9c2adcbbc9383e (patch)
treeb43911f146cd193c04ae64a0970ea96a2875eb06
parentd5208cf42c0f9b281505cb465b4de4e8179a6f9f (diff)
Ignore overflow:hidden in overview mode.
The feature was enabled to prevent flash sites from flickering due to viewport height change when the site is scrolled. Now fixed viewport height is in honeycomb, this flickering shall be a non-issue. So to support better scrolling of overflow:hidden sites and better consistency, overflow:hidden in overview mode is ignored as well. Tested on flash site http://home.disney.go.com/mwc.index to make sure no flickering happens. More testing shall be done once good flash player is there. issue: 3330038 Change-Id: Ia3f61ce49cfb970d26976d4e876c337d210a9df2
-rw-r--r--core/java/android/webkit/WebView.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index e8283a6b8b98..4a9e44189fa0 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2618,10 +2618,6 @@ public class WebView extends AbsoluteLayout
private int computeRealHorizontalScrollRange() {
if (mDrawHistory) {
return mHistoryWidth;
- } else if (mHorizontalScrollBarMode == SCROLLBAR_ALWAYSOFF
- && !mZoomManager.canZoomOut()) {
- // only honor the scrollbar mode when it is at minimum zoom level
- return computeHorizontalScrollExtent();
} else {
// to avoid rounding error caused unnecessary scrollbar, use floor
return (int) Math.floor(mContentWidth * mZoomManager.getScale());
@@ -2652,10 +2648,6 @@ public class WebView extends AbsoluteLayout
private int computeRealVerticalScrollRange() {
if (mDrawHistory) {
return mHistoryHeight;
- } else if (mVerticalScrollBarMode == SCROLLBAR_ALWAYSOFF
- && !mZoomManager.canZoomOut()) {
- // only honor the scrollbar mode when it is at minimum zoom level
- return computeVerticalScrollExtent();
} else {
// to avoid rounding error caused unnecessary scrollbar, use floor
return (int) Math.floor(mContentHeight * mZoomManager.getScale());