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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 358133002: Relaxing the stop contidtion to search for a previous continuation chain. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 1188
1189 if (!firstChild()) { 1189 if (!firstChild()) {
1190 // If this was our last child be sure to clear out our line boxes. 1190 // If this was our last child be sure to clear out our line boxes.
1191 if (childrenInline()) 1191 if (childrenInline())
1192 deleteLineBoxTree(); 1192 deleteLineBoxTree();
1193 1193
1194 // If we are an empty anonymous block in the continuation chain, 1194 // If we are an empty anonymous block in the continuation chain,
1195 // we need to remove ourself and fix the continuation chain. 1195 // we need to remove ourself and fix the continuation chain.
1196 if (!beingDestroyed() && isAnonymousBlockContinuation() && !oldChild->is ListMarker()) { 1196 if (!beingDestroyed() && isAnonymousBlockContinuation() && !oldChild->is ListMarker()) {
1197 RenderObject* containingBlockIgnoringAnonymous = containingBlock(); 1197 RenderObject* containingBlockIgnoringAnonymous = containingBlock();
1198 while (containingBlockIgnoringAnonymous && containingBlockIgnoringAn onymous->isAnonymousBlock()) 1198 while (containingBlockIgnoringAnonymous && containingBlockIgnoringAn onymous->isAnonymous())
1199 containingBlockIgnoringAnonymous = containingBlockIgnoringAnonym ous->containingBlock(); 1199 containingBlockIgnoringAnonymous = containingBlockIgnoringAnonym ous->containingBlock();
1200 for (RenderObject* curr = this; curr; curr = curr->previousInPreOrde r(containingBlockIgnoringAnonymous)) { 1200 for (RenderObject* curr = this; curr; curr = curr->previousInPreOrde r(containingBlockIgnoringAnonymous)) {
1201 if (curr->virtualContinuation() != this) 1201 if (curr->virtualContinuation() != this)
1202 continue; 1202 continue;
1203 1203
1204 // Found our previous continuation. We just need to point it to 1204 // Found our previous continuation. We just need to point it to
1205 // |this|'s next continuation. 1205 // |this|'s next continuation.
1206 RenderBoxModelObject* nextContinuation = continuation(); 1206 RenderBoxModelObject* nextContinuation = continuation();
1207 if (curr->isRenderInline()) 1207 if (curr->isRenderInline())
1208 toRenderInline(curr)->setContinuation(nextContinuation); 1208 toRenderInline(curr)->setContinuation(nextContinuation);
(...skipping 3830 matching lines...) Expand 10 before | Expand all | Expand 10 after
5039 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5039 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5040 { 5040 {
5041 showRenderObject(); 5041 showRenderObject();
5042 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5042 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5043 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5043 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5044 } 5044 }
5045 5045
5046 #endif 5046 #endif
5047 5047
5048 } // namespace WebCore 5048 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698