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

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

Issue 360833002: Divorce PaintInvalidationState from LayoutState (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ToT-Ed again :) 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
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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 lineBoxParent = this; 284 lineBoxParent = this;
285 } 285 }
286 286
287 if (markerParent != lineBoxParent || m_marker->preferredLogicalWidthsDir ty()) { 287 if (markerParent != lineBoxParent || m_marker->preferredLogicalWidthsDir ty()) {
288 // FIXME: We should not modify the structure of the render tree 288 // FIXME: We should not modify the structure of the render tree
289 // during layout. crbug.com/370461 289 // during layout. crbug.com/370461
290 DeprecatedDisableModifyRenderTreeStructureAsserts disabler; 290 DeprecatedDisableModifyRenderTreeStructureAsserts disabler;
291 291
292 // Removing and adding the marker can trigger repainting in 292 // Removing and adding the marker can trigger repainting in
293 // containers other than ourselves, so we need to disable LayoutStat e. 293 // containers other than ourselves, so we need to disable LayoutStat e.
294 ForceHorriblySlowRectMapping slowRectMapping(*this);
295 updateFirstLetter(); 294 updateFirstLetter();
296 m_marker->remove(); 295 m_marker->remove();
297 if (markerParent) 296 if (markerParent)
298 markerParent->dirtyLinesFromChangedChild(m_marker); 297 markerParent->dirtyLinesFromChangedChild(m_marker);
299 if (!lineBoxParent) 298 if (!lineBoxParent)
300 lineBoxParent = this; 299 lineBoxParent = this;
301 lineBoxParent->addChild(m_marker, firstNonMarkerChild(lineBoxParent) ); 300 lineBoxParent->addChild(m_marker, firstNonMarkerChild(lineBoxParent) );
302 m_marker->updateMarginsAndContent(); 301 m_marker->updateMarginsAndContent();
303 // If markerParent is an anonymous block that has lost all its child ren, destroy it. 302 // If markerParent is an anonymous block that has lost all its child ren, destroy it.
304 if (markerParent && markerParent->isAnonymousBlock() && !toRenderBlo ck(markerParent)->firstChild() && !toRenderBlock(markerParent)->continuation()) 303 if (markerParent && markerParent->isAnonymousBlock() && !toRenderBlo ck(markerParent)->firstChild() && !toRenderBlock(markerParent)->continuation())
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 // assume that all the following ones have too. 509 // assume that all the following ones have too.
511 // This gives us the opportunity to stop here and avoid 510 // This gives us the opportunity to stop here and avoid
512 // marking the same nodes again. 511 // marking the same nodes again.
513 break; 512 break;
514 } 513 }
515 item->updateValue(); 514 item->updateValue();
516 } 515 }
517 } 516 }
518 517
519 } // namespace WebCore 518 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698