Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 599c05f3080acd1c99f4d925c333d8a2711c9bdf 2 parents c52e565 + c25e443
John Reck authored Android (Google) Code Review committed
View
6 Source/WebCore/rendering/RenderHTMLCanvas.cpp
@@ -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();
}
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.