diff options
| author | John Reck <jreck@google.com> | 2012-06-07 17:18:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-07 17:18:07 -0700 |
| commit | 6af5a7cc82e8dec7e09cf3695f426e910e608388 (patch) | |
| tree | 9a1849f941a42c5218663836ce2c74ae76150563 /Source/WebCore | |
| parent | 866af6801cc22511a2ed3dd5b0885bc729541219 (diff) | |
| parent | 39a00d5f9095f6e8ef9480ae9fa40857f0868117 (diff) | |
| download | external_webkit-6af5a7cc82e8dec7e09cf3695f426e910e608388.zip external_webkit-6af5a7cc82e8dec7e09cf3695f426e910e608388.tar.gz external_webkit-6af5a7cc82e8dec7e09cf3695f426e910e608388.tar.bz2 | |
am 39a00d5f: am 2de717d2: Merge "Fix IFrame max scroll" into jb-dev
* commit '39a00d5f9095f6e8ef9480ae9fa40857f0868117':
Fix IFrame max scroll
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 |