diff options
| author | John Reck <jreck@android.com> | 2012-08-31 10:19:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-31 10:19:35 -0700 |
| commit | 9c867b2b4e0e91da41dd0e5efd93dd6078bc63f8 (patch) | |
| tree | 38b779f02f3248177c5d343e66f3bbef09311d80 | |
| parent | 3f9aace3c8671247a9b06117658d44282871ba89 (diff) | |
| parent | 4d33d9fbe70f0b56bd2c9bf8e6269ae21b4a5521 (diff) | |
| download | external_webkit-9c867b2b4e0e91da41dd0e5efd93dd6078bc63f8.zip external_webkit-9c867b2b4e0e91da41dd0e5efd93dd6078bc63f8.tar.gz external_webkit-9c867b2b4e0e91da41dd0e5efd93dd6078bc63f8.tar.bz2 | |
am 4d33d9fb: am 5fe0a0be: Merge "Crash on Orange media portal"
* commit '4d33d9fbe70f0b56bd2c9bf8e6269ae21b4a5521':
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(); |