diff options
| author | Chris Craik <ccraik@google.com> | 2012-10-03 10:07:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-03 10:07:29 -0700 |
| commit | df108a70a4ac13a2f67592afc32ef0be0054db2d (patch) | |
| tree | 03b29f3084ab95a8691c4b6e16ff7ac550bd7cb6 | |
| parent | e70c8a5ad2ef1ce0804b27608fd96b825fc4ee95 (diff) | |
| parent | 62e0cc56fb4f485f296e90e7426ca6412c374544 (diff) | |
| download | external_webkit-df108a70a4ac13a2f67592afc32ef0be0054db2d.zip external_webkit-df108a70a4ac13a2f67592afc32ef0be0054db2d.tar.gz external_webkit-df108a70a4ac13a2f67592afc32ef0be0054db2d.tar.bz2 | |
Merge "Prevent fixed background layers for iframes" into jb-mr1-dev
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 2 |
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) |