summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-10-02 18:21:20 -0700
committerChris Craik <ccraik@google.com>2012-10-02 18:21:20 -0700
commit62e0cc56fb4f485f296e90e7426ca6412c374544 (patch)
tree06f63f17abf7acba520fedd5cb8c760b35d8b15f
parent224e946b3cabeaa9c360bdd6865485b5acb34cdc (diff)
downloadexternal_webkit-62e0cc56fb4f485f296e90e7426ca6412c374544.zip
external_webkit-62e0cc56fb4f485f296e90e7426ca6412c374544.tar.gz
external_webkit-62e0cc56fb4f485f296e90e7426ca6412c374544.tar.bz2
Prevent fixed background layers for iframes
bug:7271856 Path was untested/broken Change-Id: I053cb0255665b57b89524debbad9f78286ba9a37
-rw-r--r--Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index 32a3c05..6edbe6a 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -591,6 +591,8 @@ void GraphicsLayerAndroid::updateFixedBackgroundLayers() {
return;
if (!view->style()->hasFixedBackgroundImage())
return;
+ if (view->isRenderIFrame()) // not supported
+ return;
Image* image = FixedBackgroundImageLayerAndroid::GetCachedImage(view->style());
if (!image)