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

Side by Side Diff: third_party/WebKit/Source/core/layout/SubtreeLayoutScope.cpp

Issue 2770123003: Replace ASSERT with DCHECK in core/layout/ excluding subdirs (Closed)
Patch Set: Split some DCHECKs and add DCHECK_ops wherever possible Created 3 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 #if DCHECK_IS_ON() 45 #if DCHECK_IS_ON()
46 for (auto* layoutObject : m_layoutObjectsToLayout) 46 for (auto* layoutObject : m_layoutObjectsToLayout)
47 layoutObject->assertLaidOut(); 47 layoutObject->assertLaidOut();
48 #endif 48 #endif
49 } 49 }
50 50
51 void SubtreeLayoutScope::setNeedsLayout( 51 void SubtreeLayoutScope::setNeedsLayout(
52 LayoutObject* descendant, 52 LayoutObject* descendant,
53 LayoutInvalidationReasonForTracing reason) { 53 LayoutInvalidationReasonForTracing reason) {
54 ASSERT(descendant->isDescendantOf(&m_root)); 54 DCHECK(descendant->isDescendantOf(&m_root));
55 descendant->setNeedsLayout(reason, MarkContainerChain, this); 55 descendant->setNeedsLayout(reason, MarkContainerChain, this);
56 } 56 }
57 57
58 void SubtreeLayoutScope::setChildNeedsLayout(LayoutObject* descendant) { 58 void SubtreeLayoutScope::setChildNeedsLayout(LayoutObject* descendant) {
59 ASSERT(descendant->isDescendantOf(&m_root)); 59 DCHECK(descendant->isDescendantOf(&m_root));
60 descendant->setChildNeedsLayout(MarkContainerChain, this); 60 descendant->setChildNeedsLayout(MarkContainerChain, this);
61 } 61 }
62 62
63 void SubtreeLayoutScope::recordObjectMarkedForLayout( 63 void SubtreeLayoutScope::recordObjectMarkedForLayout(
64 LayoutObject* layoutObject) { 64 LayoutObject* layoutObject) {
65 #if DCHECK_IS_ON() 65 #if DCHECK_IS_ON()
66 m_layoutObjectsToLayout.insert(layoutObject); 66 m_layoutObjectsToLayout.insert(layoutObject);
67 #endif 67 #endif
68 } 68 }
69 69
70 } // namespace blink 70 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698