diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-03-22 15:18:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-22 15:18:04 -0700 |
| commit | 0471b981593b698f38afb8654f7076898ef56387 (patch) | |
| tree | 3748d6a05f61a4c4bfbe4924da8efb1512cfa08e | |
| parent | a923424180b9d2cbe3a3951caed13039eef1edf6 (diff) | |
| parent | 25258f3b185d134cd6f802fc08c8b4e07006420a (diff) | |
| download | external_webkit-0471b981593b698f38afb8654f7076898ef56387.zip external_webkit-0471b981593b698f38afb8654f7076898ef56387.tar.gz external_webkit-0471b981593b698f38afb8654f7076898ef56387.tar.bz2 | |
Merge "Only enable composited fixed elements for mobile sites."
| -rw-r--r-- | WebCore/rendering/RenderLayerCompositor.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp index ea510f8..e8d476b 100644 --- a/WebCore/rendering/RenderLayerCompositor.cpp +++ b/WebCore/rendering/RenderLayerCompositor.cpp @@ -987,6 +987,9 @@ bool RenderLayerCompositor::needsToBeComposited(const RenderLayer* layer) const // static bool RenderLayerCompositor::requiresCompositingLayer(const RenderLayer* layer) const { +#if ENABLE(COMPOSITED_FIXED_ELEMENTS) + Settings* settings = m_renderView->document()->settings(); +#endif RenderObject* renderer = layer->renderer(); // The compositing state of a reflection should match that of its reflected layer. if (layer->isReflection()) { @@ -998,7 +1001,13 @@ bool RenderLayerCompositor::requiresCompositingLayer(const RenderLayer* layer) c requiresCompositingForTransform(renderer) || #if PLATFORM(ANDROID) #if ENABLE(COMPOSITED_FIXED_ELEMENTS) - layer->isFixed() || + // For the moment, we want to only enable fixed composited layers on mobile websites. + // We can consider a website as being a 'mobile' site if all the + // following checks are true: + // 1) - the viewport width is either undefined (-1) or equal to device-width (0), and + // 2) - no scaling is allowed + (((settings->viewportWidth() == -1) || (settings->viewportWidth() == 0)) && + !settings->viewportUserScalable() && layer->isFixed()) || #endif #else requiresCompositingForVideo(renderer) || |