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

Side by Side Diff: Source/core/layout/LayoutObjectChildList.cpp

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add one more file. Created 5 years, 6 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/layout/LayoutObject.cpp ('k') | Source/core/layout/LayoutPart.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) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 3 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 if (oldChild->previousSibling()) 96 if (oldChild->previousSibling())
97 oldChild->previousSibling()->setNextSibling(oldChild->nextSibling()); 97 oldChild->previousSibling()->setNextSibling(oldChild->nextSibling());
98 if (oldChild->nextSibling()) 98 if (oldChild->nextSibling())
99 oldChild->nextSibling()->setPreviousSibling(oldChild->previousSibling()) ; 99 oldChild->nextSibling()->setPreviousSibling(oldChild->previousSibling()) ;
100 100
101 if (firstChild() == oldChild) 101 if (firstChild() == oldChild)
102 setFirstChild(oldChild->nextSibling()); 102 setFirstChild(oldChild->nextSibling());
103 if (lastChild() == oldChild) 103 if (lastChild() == oldChild)
104 setLastChild(oldChild->previousSibling()); 104 setLastChild(oldChild->previousSibling());
105 105
106 oldChild->setPreviousSibling(0); 106 oldChild->setPreviousSibling(nullptr);
107 oldChild->setNextSibling(0); 107 oldChild->setNextSibling(nullptr);
108 oldChild->setParent(0); 108 oldChild->setParent(nullptr);
109 109
110 oldChild->registerSubtreeChangeListenerOnDescendants(oldChild->consumesSubtr eeChangeNotification()); 110 oldChild->registerSubtreeChangeListenerOnDescendants(oldChild->consumesSubtr eeChangeNotification());
111 111
112 if (AXObjectCache* cache = owner->document().existingAXObjectCache()) 112 if (AXObjectCache* cache = owner->document().existingAXObjectCache())
113 cache->childrenChanged(owner); 113 cache->childrenChanged(owner);
114 114
115 return oldChild; 115 return oldChild;
116 } 116 }
117 117
118 void LayoutObjectChildList::insertChildNode(LayoutObject* owner, LayoutObject* n ewChild, LayoutObject* beforeChild, bool notifyLayoutObject) 118 void LayoutObjectChildList::insertChildNode(LayoutObject* owner, LayoutObject* n ewChild, LayoutObject* beforeChild, bool notifyLayoutObject)
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 DisableCompositingQueryAsserts disabler; 190 DisableCompositingQueryAsserts disabler;
191 // FIXME: We should not allow paint invalidation out of paint invalidation s tate. crbug.com/457415 191 // FIXME: We should not allow paint invalidation out of paint invalidation s tate. crbug.com/457415
192 DisablePaintInvalidationStateAsserts paintInvalidationAssertDisabler; 192 DisablePaintInvalidationStateAsserts paintInvalidationAssertDisabler;
193 const LayoutBoxModelObject& paintInvalidationContainer = *oldChild.container ForPaintInvalidation(); 193 const LayoutBoxModelObject& paintInvalidationContainer = *oldChild.container ForPaintInvalidation();
194 oldChild.invalidatePaintUsingContainer(paintInvalidationContainer, oldChild. previousPaintInvalidationRect(), PaintInvalidationLayoutObjectRemoval); 194 oldChild.invalidatePaintUsingContainer(paintInvalidationContainer, oldChild. previousPaintInvalidationRect(), PaintInvalidationLayoutObjectRemoval);
195 if (RuntimeEnabledFeatures::slimmingPaintEnabled()) 195 if (RuntimeEnabledFeatures::slimmingPaintEnabled())
196 oldChild.invalidateDisplayItemClients(paintInvalidationContainer); 196 oldChild.invalidateDisplayItemClients(paintInvalidationContainer);
197 } 197 }
198 198
199 } // namespace blink 199 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutObject.cpp ('k') | Source/core/layout/LayoutPart.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698