diff options
| author | John Reck <jreck@google.com> | 2012-06-07 15:31:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-07 15:31:38 -0700 |
| commit | 2de717d235c5577304ae67fc92c489b7cbc2a3a1 (patch) | |
| tree | 56d8f537a282f7a65dbb3962b352b933779dace7 /Source/WebCore | |
| parent | 4ec0a85e7391da48b19280fb45999a2ca4340843 (diff) | |
| parent | 26b184f6a1fee1e371809eb3ed363d5007808c19 (diff) | |
| download | external_webkit-2de717d235c5577304ae67fc92c489b7cbc2a3a1.zip external_webkit-2de717d235c5577304ae67fc92c489b7cbc2a3a1.tar.gz external_webkit-2de717d235c5577304ae67fc92c489b7cbc2a3a1.tar.bz2 | |
Merge "Fix IFrame max scroll" into jb-dev
Diffstat (limited to 'Source/WebCore')
| -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 dadb13d..a0bd1b5 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 |