diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
| commit | 88a04ac016f57c2d78e714682445dff2e7db4ade (patch) | |
| tree | a48ca81ee3b29953121308168db22532d5b57fe2 /Source/WebCore/rendering/RenderLayer.cpp | |
| parent | 284837daa07b29d6a63a748544a90b1f5842ac5c (diff) | |
| download | qtwebkit-88a04ac016f57c2d78e714682445dff2e7db4ade.tar.gz | |
Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206)
This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future
Diffstat (limited to 'Source/WebCore/rendering/RenderLayer.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp index 271999385..30f759c5d 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp @@ -2210,9 +2210,12 @@ bool RenderLayer::shouldSuspendScrollAnimations() const return view->frameView()->shouldSuspendScrollAnimations(); } -bool RenderLayer::isOnActivePage() const +bool RenderLayer::scrollbarsCanBeActive() const { - return !m_renderer->document()->inPageCache(); + RenderView* view = renderer()->view(); + if (!view) + return false; + return view->frameView()->scrollbarsCanBeActive(); } IntPoint RenderLayer::currentMousePosition() const |