summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2011-07-08 16:54:05 -0700
committerShimeng (Simon) Wang <swang@google.com>2011-07-08 16:54:05 -0700
commitf64f5a68dd74f8313ddd4775742428cd20192f05 (patch)
treebb4ff022d2de0702d3b6c36a75f6bd97c6a058af /Source/WebCore
parent63cbafa7c232a74163d9ed8030578be970cd25a9 (diff)
downloadexternal_webkit-f64f5a68dd74f8313ddd4775742428cd20192f05.zip
external_webkit-f64f5a68dd74f8313ddd4775742428cd20192f05.tar.gz
external_webkit-f64f5a68dd74f8313ddd4775742428cd20192f05.tar.bz2
Revert "Factor the scale into the actual screen space calculation."
This reverts commit 706c2b4c3089f2832c8172c0581e3df110bf534c.
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/platform/android/ScrollViewAndroid.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/WebCore/platform/android/ScrollViewAndroid.cpp b/Source/WebCore/platform/android/ScrollViewAndroid.cpp
index 87c6a1f..f54e5ea 100644
--- a/Source/WebCore/platform/android/ScrollViewAndroid.cpp
+++ b/Source/WebCore/platform/android/ScrollViewAndroid.cpp
@@ -68,36 +68,32 @@ IntSize ScrollView::platformContentsSize() const
return m_contentsSize;
}
-static float getWebViewCoreScale(const ScrollView* view) {
- return android::WebViewCore::getWebViewCore(view)->scale();
-}
-
int ScrollView::platformActualWidth() const
{
if (parent())
return width();
- return platformWidget()->visibleWidth() * getWebViewCoreScale(this);
+ return platformWidget()->visibleWidth();
}
int ScrollView::platformActualHeight() const
{
if (parent())
return height();
- return platformWidget()->visibleHeight() * getWebViewCoreScale(this);
+ return platformWidget()->visibleHeight();
}
int ScrollView::platformActualScrollX() const
{
if (parent())
return scrollX();
- return platformWidget()->visibleX() * getWebViewCoreScale(this);
+ return platformWidget()->visibleX();
}
int ScrollView::platformActualScrollY() const
{
if (parent())
return scrollY();
- return platformWidget()->visibleY() * getWebViewCoreScale(this);
+ return platformWidget()->visibleY();
}
void ScrollView::platformSetScrollPosition(const WebCore::IntPoint& pt)