summaryrefslogtreecommitdiffstats
path: root/WebCore/page/FrameView.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/page/FrameView.cpp')
-rw-r--r--WebCore/page/FrameView.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index d9a7e98..08e55a5 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -569,6 +569,7 @@ void FrameView::setNeedsOneShotDrawingSynchronization()
#if ENABLE(ANDROID_OVERFLOW_SCROLL)
bool FrameView::hasOverflowScroll() const
{
+#ifndef ANDROID_FLATTEN_IFRAME
RenderObject* ownerRenderer = m_frame->ownerRenderer();
if (!ownerRenderer || !ownerRenderer->isRenderIFrame())
return false;
@@ -586,6 +587,8 @@ bool FrameView::hasOverflowScroll() const
if (contentsWidth() <= layoutWidth() && contentsHeight() <= layoutHeight())
return false;
return true;
+#endif
+ return false;
}
#endif
#endif // USE(ACCELERATED_COMPOSITING)