summaryrefslogtreecommitdiffstats
path: root/WebKit/android/nav
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-01-30 10:37:31 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-30 10:37:31 -0800
commit25a2029c3de01a4a842eddc0970fb513f615f458 (patch)
tree28a7097eec79ade539892b2a79c2d6a24c43d5c3 /WebKit/android/nav
parent86e2f0fb10185de5c83fed0cf4aa6818e5451615 (diff)
parent0026842c0dc9cc472966e6ef44b707683ca5317b (diff)
downloadexternal_webkit-25a2029c3de01a4a842eddc0970fb513f615f458.zip
external_webkit-25a2029c3de01a4a842eddc0970fb513f615f458.tar.gz
external_webkit-25a2029c3de01a4a842eddc0970fb513f615f458.tar.bz2
Merge "Fixed element positioning fix" into honeycomb
Diffstat (limited to 'WebKit/android/nav')
-rw-r--r--WebKit/android/nav/WebView.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 0c18d85..0fecf4f 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -481,6 +481,8 @@ bool drawGL(WebCore::IntRect& viewRect, float scale, int extras)
SkRect visibleRect;
calcOurContentVisibleRect(&visibleRect);
+ m_viewImpl->setVisibleScreenWidth(visibleRect.width());
+ m_viewImpl->setVisibleScreenHeight(visibleRect.height());
bool ret = m_baseLayer->drawGL(viewRect, visibleRect, scale);
if (ret || m_glWebViewState->currentPictureCounter() != pic)
return true;
@@ -543,6 +545,8 @@ PictureSet* draw(SkCanvas* canvas, SkColor bgColor, int extras, bool split)
compositeLayer->setExtra(extra);
SkRect visible;
calcOurContentVisibleRect(&visible);
+ m_viewImpl->setVisibleScreenWidth(visible.width());
+ m_viewImpl->setVisibleScreenHeight(visible.height());
// call this to be sure we've adjusted for any scrolling or animations
// before we actually draw
compositeLayer->updateFixedLayersPositions(visible);