summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@android.com>2012-08-31 09:52:11 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-08-31 09:52:12 -0700
commit5fe0a0bed6096da8fb7beef2708c36972d67b723 (patch)
treeb394a6c3670998940531249ff0410ce6a9e84b44
parent5423878ee1cb0965ced62800f36933841eaa40f6 (diff)
parente90019d2a3c455d2bee14682e8973dcd33460010 (diff)
downloadexternal_webkit-5fe0a0bed6096da8fb7beef2708c36972d67b723.zip
external_webkit-5fe0a0bed6096da8fb7beef2708c36972d67b723.tar.gz
external_webkit-5fe0a0bed6096da8fb7beef2708c36972d67b723.tar.bz2
Merge "Crash on Orange media portal"
-rw-r--r--Source/WebCore/rendering/RenderObject.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp
index 012427c..ccd7c14 100644
--- a/Source/WebCore/rendering/RenderObject.cpp
+++ b/Source/WebCore/rendering/RenderObject.cpp
@@ -1667,6 +1667,12 @@ void RenderObject::styleWillChange(StyleDifference diff, const RenderStyle* newS
// If our z-index changes value or our visibility changes,
// we need to dirty our stacking context's z-order list.
if (newStyle) {
+#if ENABLE(COMPOSITED_FIXED_ELEMENTS)
+ RenderLayer* layer = hasLayer() ? enclosingLayer() : 0;
+ if (layer && m_style->position() != newStyle->position()
+ && (m_style->position() == FixedPosition || newStyle->position() == FixedPosition))
+ layer->dirtyZOrderLists();
+#endif
bool visibilityChanged = m_style->visibility() != newStyle->visibility()
|| m_style->zIndex() != newStyle->zIndex()
|| m_style->hasAutoZIndex() != newStyle->hasAutoZIndex();