summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVeluppillai Arulesan <varulesa@codeaurora.org>2012-11-06 09:41:27 -0500
committerSteve Kondik <shade@chemlab.org>2013-01-20 18:38:32 -0800
commitf7256e9a2a3bc90454bb86054c91b94ba47d87ea (patch)
treebdfda2f58efe262614482cbe26239346bb3ce540
parent4da5f26c019971a319dda77e4bfe6480c269bdf1 (diff)
downloadexternal_webkit-f7256e9a2a3bc90454bb86054c91b94ba47d87ea.zip
external_webkit-f7256e9a2a3bc90454bb86054c91b94ba47d87ea.tar.gz
external_webkit-f7256e9a2a3bc90454bb86054c91b94ba47d87ea.tar.bz2
Bug fix for guimark3 test banner
Bring behaviour in line with chrome CRs-fixed: 380778 (cherry-picked from commit 403795abde7bb61fc2213628215ff6ad4591d241) Change-Id: I7c2256ebe40933f007d962a6cd44841b4223748a
-rw-r--r--Source/WebCore/rendering/RenderLayer.cpp6
1 files changed, 6 insertions, 0 deletions
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();