diff options
author | John Reck <jreck@google.com> | 2012-06-07 14:50:35 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2012-06-07 14:50:35 -0700 |
commit | 26b184f6a1fee1e371809eb3ed363d5007808c19 (patch) | |
tree | a80af32eab41c746040633e12f5a889f9f11a830 | |
parent | 7da43ef8daf722f6d10dc4c452e1dc7be11b4a9f (diff) | |
download | webkit-26b184f6a1fee1e371809eb3ed363d5007808c19.tar.gz |
Fix IFrame max scroll
Bug: 6628376
m_scrollLimits has the correct max scroll range, even for iframes
Change-Id: Id6f23e23652e38fe6df8d6540977dc0ab7e8d332
-rw-r--r-- | Source/WebCore/platform/graphics/android/layers/IFrameContentLayerAndroid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/IFrameContentLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/IFrameContentLayerAndroid.cpp index dadb13d1a..a0bd1b591 100644 --- a/Source/WebCore/platform/graphics/android/layers/IFrameContentLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/layers/IFrameContentLayerAndroid.cpp @@ -33,8 +33,8 @@ void IFrameContentLayerAndroid::getScrollRect(SkIRect* out) const out->fLeft = m_scrollLimits.fLeft - pos.fX + m_iframeScrollOffset.x(); out->fTop = m_scrollLimits.fTop - pos.fY + m_iframeScrollOffset.y(); - out->fRight = getSize().width() - m_scrollLimits.width(); - out->fBottom = getSize().height() - m_scrollLimits.height(); + out->fRight = m_scrollLimits.width(); + out->fBottom = m_scrollLimits.height(); } } // namespace WebCore |