summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-10-14 09:27:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-14 09:27:00 -0700
commit4b5d036721667d5a044664a13b18a2cec2c541b4 (patch)
treea731b96b8b78c5edd7f6a6431a306dbbfceeca95 /Source/WebCore
parent036a4662d3b03554e3563ca093fdefb250d19c17 (diff)
parent383cc12851b723ebdaf6dddc7cb16d62cf7c7c7e (diff)
downloadexternal_webkit-4b5d036721667d5a044664a13b18a2cec2c541b4.zip
external_webkit-4b5d036721667d5a044664a13b18a2cec2c541b4.tar.gz
external_webkit-4b5d036721667d5a044664a13b18a2cec2c541b4.tar.bz2
am 383cc128: Cherry-pick WebKit change 89836 to fix a crash due to floats not being removed
* commit '383cc12851b723ebdaf6dddc7cb16d62cf7c7c7e': Cherry-pick WebKit change 89836 to fix a crash due to floats not being removed
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/rendering/RenderBlock.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp
index 4df6066..8fa021f 100644
--- a/Source/WebCore/rendering/RenderBlock.cpp
+++ b/Source/WebCore/rendering/RenderBlock.cpp
@@ -226,6 +226,9 @@ void RenderBlock::styleWillChange(StyleDifference diff, const RenderStyle* newSt
if (cb->isRenderBlock())
toRenderBlock(cb)->removePositionedObjects(this);
}
+
+ if (containsFloats() && !isFloating() && !isPositioned() && (newStyle->position() == AbsolutePosition || newStyle->position() == FixedPosition))
+ markAllDescendantsWithFloatsForLayout();
}
RenderBox::styleWillChange(diff, newStyle);