Revert "Put canvas on a layer"
Bug: 5712065
This reverts commit 35e0b8dd7902e92f50ede4df2e4bad4ed581b770
diff --git a/Source/WebCore/rendering/RenderHTMLCanvas.cpp b/Source/WebCore/rendering/RenderHTMLCanvas.cpp
index ada79e9..de2a2c1 100644
--- a/Source/WebCore/rendering/RenderHTMLCanvas.cpp
+++ b/Source/WebCore/rendering/RenderHTMLCanvas.cpp
@@ -47,13 +47,9 @@
bool RenderHTMLCanvas::requiresLayer() const
{
-#if PLATFORM(ANDROID)
- return true;
-#endif
-
if (RenderReplaced::requiresLayer())
return true;
-
+
HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(node());
return canvas && canvas->renderingContext() && canvas->renderingContext()->isAccelerated();
}
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
index 85c57a6..5827636 100644
--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1384,8 +1384,6 @@
if (layer->isFixed())
return true;
#endif
- if (layer->renderer()->isCanvas())
- return true;
return false;
}
#endif