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

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

Issue 2754723004: Replace RELEASE_ASSERT with CHECK in core/layout/ (Closed)
Patch Set: Created 3 years, 9 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 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "core/layout/SubtreeLayoutScope.h" 31 #include "core/layout/SubtreeLayoutScope.h"
32 32
33 #include "core/frame/FrameView.h" 33 #include "core/frame/FrameView.h"
34 #include "core/layout/LayoutObject.h" 34 #include "core/layout/LayoutObject.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 SubtreeLayoutScope::SubtreeLayoutScope(LayoutObject& root) : m_root(root) { 38 SubtreeLayoutScope::SubtreeLayoutScope(LayoutObject& root) : m_root(root) {
39 RELEASE_ASSERT(m_root.document().view()->isInPerformLayout()); 39 CHECK(m_root.document().view()->isInPerformLayout());
40 } 40 }
41 41
42 SubtreeLayoutScope::~SubtreeLayoutScope() { 42 SubtreeLayoutScope::~SubtreeLayoutScope() {
43 RELEASE_ASSERT(!m_root.needsLayout()); 43 CHECK(!m_root.needsLayout());
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 ASSERT(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 ASSERT(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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTableSection.cpp ('k') | third_party/WebKit/Source/core/layout/TextAutosizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698