Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Unified Diff: Source/WebCore/rendering/InlineFlowBox.cpp

Issue 6598044: Merge 79734 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/rendering/InlineFlowBox.cpp
===================================================================
--- Source/WebCore/rendering/InlineFlowBox.cpp (revision 79910)
+++ Source/WebCore/rendering/InlineFlowBox.cpp (working copy)
@@ -940,13 +940,20 @@
RenderBlock* cb = 0;
bool containingBlockPaintsContinuationOutline = inlineFlow->continuation() || inlineFlow->isInlineElementContinuation();
- if (containingBlockPaintsContinuationOutline) {
- cb = renderer()->containingBlock()->containingBlock();
-
- for (RenderBoxModelObject* box = boxModelObject(); box != cb; box = box->parent()->enclosingBoxModelObject()) {
- if (box->hasSelfPaintingLayer()) {
- containingBlockPaintsContinuationOutline = false;
- break;
+ if (containingBlockPaintsContinuationOutline) {
+ // FIXME: See https://bugs.webkit.org/show_bug.cgi?id=54690. We currently don't reconnect inline continuations
+ // after a child removal. As a result, those merged inlines do not get seperated and hence not get enclosed by
+ // anonymous blocks. In this case, it is better to bail out and paint it ourself.
+ RenderBlock* enclosingAnonymousBlock = renderer()->containingBlock();
+ if (!enclosingAnonymousBlock->isAnonymousBlock())
+ containingBlockPaintsContinuationOutline = false;
+ else {
+ cb = enclosingAnonymousBlock->containingBlock();
+ for (RenderBoxModelObject* box = boxModelObject(); box != cb; box = box->parent()->enclosingBoxModelObject()) {
+ if (box->hasSelfPaintingLayer()) {
+ containingBlockPaintsContinuationOutline = false;
+ break;
+ }
}
}
}

Powered by Google App Engine
This is Rietveld 408576698