diff options
| author | John Reck <jreck@android.com> | 2012-08-31 10:15:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-31 10:15:33 -0700 |
| commit | 4d33d9fbe70f0b56bd2c9bf8e6269ae21b4a5521 (patch) | |
| tree | 5c109074ac2cc8c7aa9f074bc74dfa946649624a | |
| parent | 76150b639b267a6f89506ad9b75c7eae5e2b60c2 (diff) | |
| parent | 5fe0a0bed6096da8fb7beef2708c36972d67b723 (diff) | |
| download | external_webkit-4d33d9fbe70f0b56bd2c9bf8e6269ae21b4a5521.zip external_webkit-4d33d9fbe70f0b56bd2c9bf8e6269ae21b4a5521.tar.gz external_webkit-4d33d9fbe70f0b56bd2c9bf8e6269ae21b4a5521.tar.bz2 | |
am 5fe0a0be: Merge "Crash on Orange media portal"
* commit '5fe0a0bed6096da8fb7beef2708c36972d67b723':
Crash on Orange media portal
| -rw-r--r-- | Source/WebCore/rendering/RenderObject.cpp | 6 |
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(); |