diff options
| author | Steve Block <steveblock@google.com> | 2011-10-14 11:34:13 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-10-14 15:56:51 +0100 |
| commit | 383cc12851b723ebdaf6dddc7cb16d62cf7c7c7e (patch) | |
| tree | 1caf3e5bf8ee5269d88c73321d6919388e92dd19 /Source/WebCore/rendering/RenderBlock.cpp | |
| parent | 4fb1f2dd7e874d968a0effac0dd1e0ea8e94f46d (diff) | |
| download | external_webkit-383cc12851b723ebdaf6dddc7cb16d62cf7c7c7e.zip external_webkit-383cc12851b723ebdaf6dddc7cb16d62cf7c7c7e.tar.gz external_webkit-383cc12851b723ebdaf6dddc7cb16d62cf7c7c7e.tar.bz2 | |
Cherry-pick WebKit change 89836 to fix a crash due to floats not being removed
This is part 2 of 2 of the fix.
See http://trac.webkit.org/changeset/89836
Bug: 5249309
Change-Id: If23a41a8e75e5fb6ba9e84e481ca44a319f678ef
Diffstat (limited to 'Source/WebCore/rendering/RenderBlock.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderBlock.cpp | 3 |
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); |