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

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

Issue 397333002: Remove updateFirstLetter from RenderListItem::updateMarkerLocation (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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 | Annotate | Revision Log
« 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 * 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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 // If the marker is currently contained inside an anonymous box, then we 291 // If the marker is currently contained inside an anonymous box, then we
292 // are the only item in that anonymous box (since no line box parent was 292 // are the only item in that anonymous box (since no line box parent was
293 // found). It's ok to just leave the marker where it is in this case. 293 // found). It's ok to just leave the marker where it is in this case.
294 if (markerParent && markerParent->isAnonymousBlock()) 294 if (markerParent && markerParent->isAnonymousBlock())
295 lineBoxParent = markerParent; 295 lineBoxParent = markerParent;
296 else 296 else
297 lineBoxParent = this; 297 lineBoxParent = this;
298 } 298 }
299 299
300 if (markerParent != lineBoxParent) { 300 if (markerParent != lineBoxParent) {
301 updateFirstLetter();
302 m_marker->remove(); 301 m_marker->remove();
303 lineBoxParent->addChild(m_marker, firstNonMarkerChild(lineBoxParent)); 302 lineBoxParent->addChild(m_marker, firstNonMarkerChild(lineBoxParent));
304 m_marker->updateMarginsAndContent(); 303 m_marker->updateMarginsAndContent();
305 // If markerParent is an anonymous block with no children, destroy it. 304 // If markerParent is an anonymous block with no children, destroy it.
306 if (markerParent && markerParent->isAnonymousBlock() && !toRenderBlock(m arkerParent)->firstChild() && !toRenderBlock(markerParent)->continuation()) 305 if (markerParent && markerParent->isAnonymousBlock() && !toRenderBlock(m arkerParent)->firstChild() && !toRenderBlock(markerParent)->continuation())
307 markerParent->destroy(); 306 markerParent->destroy();
308 return true; 307 return true;
309 } 308 }
310 309
311 return false; 310 return false;
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 // assume that all the following ones have too. 516 // assume that all the following ones have too.
518 // This gives us the opportunity to stop here and avoid 517 // This gives us the opportunity to stop here and avoid
519 // marking the same nodes again. 518 // marking the same nodes again.
520 break; 519 break;
521 } 520 }
522 item->updateValue(); 521 item->updateValue();
523 } 522 }
524 } 523 }
525 524
526 } // namespace WebCore 525 } // 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