From 35e0b8dd7902e92f50ede4df2e4bad4ed581b770 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Mon, 28 Nov 2011 12:58:00 -0800
Subject: Put canvas on a layer

 Bug: 5666191

Change-Id: I30708d508b7e05e8bcbc6c22413134ca378f6d2c
---
 Source/WebCore/rendering/RenderHTMLCanvas.cpp      | 6 +++++-
 Source/WebCore/rendering/RenderLayerCompositor.cpp | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'Source/WebCore/rendering')

diff --git a/Source/WebCore/rendering/RenderHTMLCanvas.cpp b/Source/WebCore/rendering/RenderHTMLCanvas.cpp
index de2a2c1..ada79e9 100644
--- a/Source/WebCore/rendering/RenderHTMLCanvas.cpp
+++ b/Source/WebCore/rendering/RenderHTMLCanvas.cpp
@@ -47,9 +47,13 @@ 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();
 }
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
index 5827636..85c57a6 100644
--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1384,6 +1384,8 @@ bool RenderLayerCompositor::requiresCompositingForAndroidLayers(const RenderLaye
     if (layer->isFixed())
         return true;
 #endif
+    if (layer->renderer()->isCanvas())
+        return true;
     return false;
 }
 #endif
-- 
cgit v1.1