From f7256e9a2a3bc90454bb86054c91b94ba47d87ea Mon Sep 17 00:00:00 2001
From: Veluppillai Arulesan <varulesa@codeaurora.org>
Date: Tue, 6 Nov 2012 09:41:27 -0500
Subject: Bug fix for guimark3 test banner

Bring behaviour in line with chrome

CRs-fixed: 380778

(cherry-picked from commit 403795abde7bb61fc2213628215ff6ad4591d241)

Change-Id: I7c2256ebe40933f007d962a6cd44841b4223748a
---
 Source/WebCore/rendering/RenderLayer.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
index b6662f6..3cdeda8 100644
--- a/Source/WebCore/rendering/RenderLayer.cpp
+++ b/Source/WebCore/rendering/RenderLayer.cpp
@@ -4049,6 +4049,9 @@ bool RenderLayer::shouldBeNormalFlowOnly() const
                 || renderer()->hasReflection()
                 || renderer()->hasMask()
                 || renderer()->isVideo()
+#if PLATFORM(ANDROID)
+                || renderer()->isCanvas()
+#endif
                 || renderer()->isEmbeddedObject()
                 || renderer()->isApplet()
                 || renderer()->isRenderIFrame()
@@ -4070,6 +4073,9 @@ bool RenderLayer::isSelfPaintingLayer() const
         || renderer()->hasMask()
         || renderer()->isTableRow()
         || renderer()->isVideo()
+#if PLATFORM(ANDROID)
+        || renderer()->isCanvas()
+#endif
         || renderer()->isEmbeddedObject()
         || renderer()->isApplet()
         || renderer()->isRenderIFrame();
-- 
cgit v1.1