Permalink
Browse files

Merge "Revert "Put canvas on a layer"" into ics-mr1

  • Loading branch information...
2 parents c52e565 + c25e443 commit 599c05f3080acd1c99f4d925c333d8a2711c9bdf @jreck jreck committed with Android (Google) Code Review Dec 13, 2011
@@ -47,13 +47,9 @@ RenderHTMLCanvas::RenderHTMLCanvas(HTMLCanvasElement* element)
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();
}
@@ -1384,8 +1384,6 @@ bool RenderLayerCompositor::requiresCompositingForAndroidLayers(const RenderLaye
if (layer->isFixed())
return true;
#endif
- if (layer->renderer()->isCanvas())
- return true;
return false;
}
#endif

0 comments on commit 599c05f

Please sign in to comment.