diff options
| author | John Reck <jreck@google.com> | 2012-03-05 17:07:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-05 17:07:48 -0800 |
| commit | e08cc3f512d262d8b82b4fb5f661b95ea4d74d9b (patch) | |
| tree | 9687160b002889f80416b80c60f239a85ef0b07e /Source | |
| parent | 217e14b07cda7e459bdc5eb81d053a3050d39547 (diff) | |
| parent | 19973ef487ea5be4320e9404b06b7328fc597fbf (diff) | |
| download | external_webkit-e08cc3f512d262d8b82b4fb5f661b95ea4d74d9b.zip external_webkit-e08cc3f512d262d8b82b4fb5f661b95ea4d74d9b.tar.gz external_webkit-e08cc3f512d262d8b82b4fb5f661b95ea4d74d9b.tar.bz2 | |
Merge "Fix scrollable divs"
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.cpp index ab7f566..205727c 100644 --- a/Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/ScrollableLayerAndroid.cpp @@ -47,7 +47,7 @@ void ScrollableLayerAndroid::getScrollRect(SkIRect* out) const { const SkPoint& pos = getPosition(); out->fLeft = m_scrollLimits.fLeft - pos.fX; - out->fTop = m_scrollLimits.fTop - pos.fY + m_offset.y(); + out->fTop = m_scrollLimits.fTop - pos.fY; if (isIFrame()) { out->fLeft += m_iframeScrollOffset.x(); |