summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/rendering/RenderLayerCompositor.cpp
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-12-13 13:16:40 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-12-13 13:16:40 -0800
commit599c05f3080acd1c99f4d925c333d8a2711c9bdf (patch)
tree63716bef06e7654fe8af18140d5135043d293c71 /Source/WebCore/rendering/RenderLayerCompositor.cpp
parentc52e5656adae84b9be8d0e10f0e68bfca988fe9a (diff)
parentc25e44371cee46d5ba925ef59b9af726cbbc6480 (diff)
downloadexternal_webkit-599c05f3080acd1c99f4d925c333d8a2711c9bdf.zip
external_webkit-599c05f3080acd1c99f4d925c333d8a2711c9bdf.tar.gz
external_webkit-599c05f3080acd1c99f4d925c333d8a2711c9bdf.tar.bz2
Merge "Revert "Put canvas on a layer"" into ics-mr1
Diffstat (limited to 'Source/WebCore/rendering/RenderLayerCompositor.cpp')
-rw-r--r--Source/WebCore/rendering/RenderLayerCompositor.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
index 06fa0f6..1ef3b77 100644
--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1384,8 +1384,6 @@ bool RenderLayerCompositor::requiresCompositingForAndroidLayers(const RenderLaye
if (layer->isFixed())
return true;
#endif
- if (layer->renderer()->isCanvas())
- return true;
return false;
}
#endif