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

Side by Side Diff: Source/WebCore/rendering/RenderListItem.cpp

Issue 9562039: Merge 108548 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 9 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 | « LayoutTests/platform/qt/editing/execCommand/create-list-with-hr-expected.txt ('k') | 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 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 else 210 else
211 lineBoxParent = this; 211 lineBoxParent = this;
212 } 212 }
213 213
214 if (markerPar != lineBoxParent || m_marker->preferredLogicalWidthsDirty( )) { 214 if (markerPar != lineBoxParent || m_marker->preferredLogicalWidthsDirty( )) {
215 // Removing and adding the marker can trigger repainting in 215 // Removing and adding the marker can trigger repainting in
216 // containers other than ourselves, so we need to disable LayoutStat e. 216 // containers other than ourselves, so we need to disable LayoutStat e.
217 LayoutStateDisabler layoutStateDisabler(view()); 217 LayoutStateDisabler layoutStateDisabler(view());
218 updateFirstLetter(); 218 updateFirstLetter();
219 m_marker->remove(); 219 m_marker->remove();
220 // If markerPar is an anonymous block that will lose all its childre n, destroy it
221 if (markerPar && (markerPar != lineBoxParent) && markerPar->isAnonym ousBlock() && !(toRenderBlock(markerPar)->firstChild()))
222 markerPar->destroy();
220 if (!lineBoxParent) 223 if (!lineBoxParent)
221 lineBoxParent = this; 224 lineBoxParent = this;
222 lineBoxParent->addChild(m_marker, firstNonMarkerChild(lineBoxParent) ); 225 lineBoxParent->addChild(m_marker, firstNonMarkerChild(lineBoxParent) );
223 if (m_marker->preferredLogicalWidthsDirty()) 226 if (m_marker->preferredLogicalWidthsDirty())
224 m_marker->computePreferredLogicalWidths(); 227 m_marker->computePreferredLogicalWidths();
225 } 228 }
226 } 229 }
227 } 230 }
228 231
229 void RenderListItem::computePreferredLogicalWidths() 232 void RenderListItem::computePreferredLogicalWidths()
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 } 457 }
455 458
456 item->updateValue(); 459 item->updateValue();
457 } 460 }
458 461
459 child = child->nextInPreOrder(list); 462 child = child->nextInPreOrder(list);
460 } 463 }
461 } 464 }
462 465
463 } // namespace WebCore 466 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/platform/qt/editing/execCommand/create-list-with-hr-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698