summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-02-17 17:03:29 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-17 17:03:29 -0800
commitfc4a7c214a17115d92d1a036c76221e1bca8bcb5 (patch)
treedbe25a4a4c98629ceab292877bc2f2249bd7f3fa
parentbce34f2035f2ece4f3273c79a9723377011f7f86 (diff)
parentded122ca732de13ba649ee28d909121bc40896f8 (diff)
downloadexternal_webkit-fc4a7c214a17115d92d1a036c76221e1bca8bcb5.zip
external_webkit-fc4a7c214a17115d92d1a036c76221e1bca8bcb5.tar.gz
external_webkit-fc4a7c214a17115d92d1a036c76221e1bca8bcb5.tar.bz2
Merge "Fixed element in iframe should have a layer"
-rw-r--r--WebCore/rendering/RenderLayerCompositor.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp
index 9775134..a115bfe 100644
--- a/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1193,10 +1193,6 @@ bool RenderLayerCompositor::requiresCompositingForAndroidLayers(const RenderLaye
return true;
#endif
#if ENABLE(COMPOSITED_FIXED_ELEMENTS)
- // First, check if we are in an iframe, and if so bail out
- if (m_renderView->document()->frame()->tree()->parent())
- return false;
-
// 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