commit 599c05f3080acd1c99f4d925c333d8a2711c9bdf
author John Reck <jreck@google.com> Tue Dec 13 13:16:40 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 13 13:16:40 2011 -0800
tree 63716bef06e7654fe8af18140d5135043d293c71
parent c52e5656adae84b9be8d0e10f0e68bfca988fe9a
parent c25e44371cee46d5ba925ef59b9af726cbbc6480

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

Source/WebCore/rendering/RenderHTMLCanvas.cpp

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();
 }

Source/WebCore/rendering/RenderLayerCompositor.cpp

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 @@
     if (layer->isFixed())
         return true;
 #endif
-    if (layer->renderer()->isCanvas())
-        return true;
     return false;
 }
 #endif