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

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

Issue 164553004: Convert LayoutState/LayoutStateMaintainer/LayoutStateDisabler to references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 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 unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderListBox.cpp ('k') | Source/core/rendering/RenderMedia.cpp » ('j') | 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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 // in this case. 285 // in this case.
286 if (markerParent && markerParent->isAnonymousBlock()) 286 if (markerParent && markerParent->isAnonymousBlock())
287 lineBoxParent = markerParent; 287 lineBoxParent = markerParent;
288 else 288 else
289 lineBoxParent = this; 289 lineBoxParent = this;
290 } 290 }
291 291
292 if (markerParent != lineBoxParent || m_marker->preferredLogicalWidthsDir ty()) { 292 if (markerParent != lineBoxParent || m_marker->preferredLogicalWidthsDir ty()) {
293 // Removing and adding the marker can trigger repainting in 293 // Removing and adding the marker can trigger repainting in
294 // containers other than ourselves, so we need to disable LayoutStat e. 294 // containers other than ourselves, so we need to disable LayoutStat e.
295 LayoutStateDisabler layoutStateDisabler(view()); 295 LayoutStateDisabler layoutStateDisabler(*this);
296 updateFirstLetter(); 296 updateFirstLetter();
297 m_marker->remove(); 297 m_marker->remove();
298 if (markerParent) 298 if (markerParent)
299 markerParent->dirtyLinesFromChangedChild(m_marker); 299 markerParent->dirtyLinesFromChangedChild(m_marker);
300 if (!lineBoxParent) 300 if (!lineBoxParent)
301 lineBoxParent = this; 301 lineBoxParent = this;
302 lineBoxParent->addChild(m_marker, firstNonMarkerChild(lineBoxParent) ); 302 lineBoxParent->addChild(m_marker, firstNonMarkerChild(lineBoxParent) );
303 m_marker->updateMarginsAndContent(); 303 m_marker->updateMarginsAndContent();
304 // If markerParent is an anonymous block that has lost all its child ren, destroy it. 304 // If markerParent is an anonymous block that has lost all its child ren, destroy it.
305 if (markerParent && markerParent->isAnonymousBlock() && !markerParen t->firstChild() && !toRenderBlock(markerParent)->continuation()) 305 if (markerParent && markerParent->isAnonymousBlock() && !markerParen t->firstChild() && !toRenderBlock(markerParent)->continuation())
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 // assume that all the following ones have too. 526 // assume that all the following ones have too.
527 // This gives us the opportunity to stop here and avoid 527 // This gives us the opportunity to stop here and avoid
528 // marking the same nodes again. 528 // marking the same nodes again.
529 break; 529 break;
530 } 530 }
531 item->updateValue(); 531 item->updateValue();
532 } 532 }
533 } 533 }
534 534
535 } // namespace WebCore 535 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListBox.cpp ('k') | Source/core/rendering/RenderMedia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698