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

Side by Side Diff: Source/core/dom/DocumentLifecycle.h

Issue 1175173002: Simplify inDetach() assert and make it stronger. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/Node.h » ('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) 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 126
127 bool stateAllowsTreeMutations() const; 127 bool stateAllowsTreeMutations() const;
128 bool stateAllowsLayoutTreeMutations() const; 128 bool stateAllowsLayoutTreeMutations() const;
129 bool stateAllowsDetach() const; 129 bool stateAllowsDetach() const;
130 bool stateAllowsLayoutInvalidation() const; 130 bool stateAllowsLayoutInvalidation() const;
131 bool stateAllowsLayoutTreeNotifications() const; 131 bool stateAllowsLayoutTreeNotifications() const;
132 132
133 void advanceTo(State); 133 void advanceTo(State);
134 void ensureStateAtMost(State); 134 void ensureStateAtMost(State);
135 135
136 bool inDetach() const { return m_detachCount; }
136 void incrementDetachCount() { m_detachCount++; } 137 void incrementDetachCount() { m_detachCount++; }
137 void decrementDetachCount() 138 void decrementDetachCount()
138 { 139 {
139 ASSERT(m_detachCount > 0); 140 ASSERT(m_detachCount > 0);
140 m_detachCount--; 141 m_detachCount--;
141 } 142 }
142 143
143 private: 144 private:
144 #if ENABLE(ASSERT) 145 #if ENABLE(ASSERT)
145 bool canAdvanceTo(State) const; 146 bool canAdvanceTo(State) const;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 inline bool DocumentLifecycle::stateAllowsLayoutInvalidation() const 186 inline bool DocumentLifecycle::stateAllowsLayoutInvalidation() const
186 { 187 {
187 return m_state != InPerformLayout 188 return m_state != InPerformLayout
188 && m_state != InCompositingUpdate 189 && m_state != InCompositingUpdate
189 && m_state != InPaintInvalidation; 190 && m_state != InPaintInvalidation;
190 } 191 }
191 192
192 } // namespace blink 193 } // namespace blink
193 194
194 #endif 195 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698