diff options
author | Teng-Hui Zhu <ztenghui@google.com> | 2011-02-23 17:10:23 -0800 |
---|---|---|
committer | Teng-Hui Zhu <ztenghui@google.com> | 2011-02-24 14:28:51 -0800 |
commit | 4a15ff661cbcd7667b4211815668d1d042c4b626 (patch) | |
tree | 07857e2fdcf3aa0e93216fe6e5117261aca898ff /WebCore/rendering/RenderLayerCompositor.cpp | |
parent | ae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca (diff) | |
download | external_webkit-4a15ff661cbcd7667b4211815668d1d042c4b626.zip external_webkit-4a15ff661cbcd7667b4211815668d1d042c4b626.tar.gz external_webkit-4a15ff661cbcd7667b4211815668d1d042c4b626.tar.bz2 |
revert "Enable layers for fixed elements only for mobile websites"
revert #change,93656
Now we will use layer for fixed element in desktop site, too.
Change-Id: I0a86d46f86fa75b704286aa613e967108851b990
Diffstat (limited to 'WebCore/rendering/RenderLayerCompositor.cpp')
-rw-r--r-- | WebCore/rendering/RenderLayerCompositor.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp index a115bfe..6578d1d 100644 --- a/WebCore/rendering/RenderLayerCompositor.cpp +++ b/WebCore/rendering/RenderLayerCompositor.cpp @@ -1193,23 +1193,10 @@ bool RenderLayerCompositor::requiresCompositingForAndroidLayers(const RenderLaye return true; #endif #if ENABLE(COMPOSITED_FIXED_ELEMENTS) - // For the moment, we want to only enable fixed composited layers on mobile websites. - // Enable composited layers (for fixed elements) - // 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 - if (!layer->isFixed()) - return false; - - Settings* settings = m_renderView->document()->settings(); - if (!settings) - return false; - if ((settings->viewportWidth() == -1 || settings->viewportWidth() == 0) && - !settings->viewportUserScalable()) + // Enable composited layers (for fixed elements) + if (layer->isFixed()) return true; - #endif return false; } |