Index: Source/core/rendering/RenderInline.cpp |
diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp |
index a431a76f93976c69a50e131323494e28f3e980ad..71c7bc4341ad24a26c3d250c5265e101976a75de 100644 |
--- a/Source/core/rendering/RenderInline.cpp |
+++ b/Source/core/rendering/RenderInline.cpp |
@@ -503,6 +503,13 @@ void RenderInline::splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox |
} |
} |
+ // Always just do a full layout in order to ensure that line boxes (especially wrappers for images) |
+ // get deleted properly. Because objects moves from the pre block into the post block, we want to |
+ // make new line boxes instead of leaving the old line boxes around. |
+ pre->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
+ block->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
+ post->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
mstensho (USE GERRIT)
2015/01/28 10:43:16
If we only keep this change but drop the ones in R
dsinclair
2015/01/28 16:35:01
So, this is moved up just to guard against the cas
mstensho (USE GERRIT)
2015/01/28 16:51:19
Correct. But I don't know if would still be possib
dsinclair
2015/01/28 17:08:06
Yea, lets put this back in that case, and file a b
mstensho (USE GERRIT)
2015/01/28 17:19:54
Done.
Sounds like something to do while working o
|
+ |
splitInlines(pre, post, newBlockBox, beforeChild, oldCont); |
// We already know the newBlockBox isn't going to contain inline kids, so avoid wasting |
@@ -510,13 +517,6 @@ void RenderInline::splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox |
newBlockBox->setChildrenInline(false); |
newBlockBox->addChild(newChild); |
- |
- // Always just do a full layout in order to ensure that line boxes (especially wrappers for images) |
- // get deleted properly. Because objects moves from the pre block into the post block, we want to |
- // make new line boxes instead of leaving the old line boxes around. |
- pre->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
- block->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
- post->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
} |
void RenderInline::addChildToContinuation(RenderObject* newChild, RenderObject* beforeChild) |