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

Side by Side Diff: Source/core/dom/Node.cpp

Issue 327323002: Start removing the double-negative !ASSERT_DISABLED (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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/Element.cpp ('k') | Source/core/dom/ScriptForbiddenScope.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) 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 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 2354 matching lines...) Expand 10 before | Expand all | Expand 10 after
2365 inline void TreeScope::removedLastRefToScope() 2365 inline void TreeScope::removedLastRefToScope()
2366 { 2366 {
2367 ASSERT_WITH_SECURITY_IMPLICATION(!deletionHasBegun()); 2367 ASSERT_WITH_SECURITY_IMPLICATION(!deletionHasBegun());
2368 if (m_guardRefCount) { 2368 if (m_guardRefCount) {
2369 // If removing a child removes the last self-only ref, we don't 2369 // If removing a child removes the last self-only ref, we don't
2370 // want the scope to be destructed until after 2370 // want the scope to be destructed until after
2371 // removeDetachedChildren returns, so we guard ourselves with an 2371 // removeDetachedChildren returns, so we guard ourselves with an
2372 // extra self-only ref. 2372 // extra self-only ref.
2373 guardRef(); 2373 guardRef();
2374 dispose(); 2374 dispose();
2375 #if !ASSERT_DISABLED 2375 #if ASSERT_ENABLED
2376 // We need to do this right now since guardDeref() can delete this. 2376 // We need to do this right now since guardDeref() can delete this.
2377 rootNode().m_inRemovedLastRefFunction = false; 2377 rootNode().m_inRemovedLastRefFunction = false;
2378 #endif 2378 #endif
2379 guardDeref(); 2379 guardDeref();
2380 } else { 2380 } else {
2381 #if !ASSERT_DISABLED 2381 #if ASSERT_ENABLED
2382 rootNode().m_inRemovedLastRefFunction = false; 2382 rootNode().m_inRemovedLastRefFunction = false;
2383 #endif 2383 #endif
2384 #if SECURITY_ASSERT_ENABLED 2384 #if SECURITY_ASSERT_ENABLED
2385 beginDeletion(); 2385 beginDeletion();
2386 #endif 2386 #endif
2387 delete this; 2387 delete this;
2388 } 2388 }
2389 } 2389 }
2390 2390
2391 // It's important not to inline removedLastRef, because we don't want to inline the code to 2391 // It's important not to inline removedLastRef, because we don't want to inline the code to
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
2596 node->showTreeForThis(); 2596 node->showTreeForThis();
2597 } 2597 }
2598 2598
2599 void showNodePath(const WebCore::Node* node) 2599 void showNodePath(const WebCore::Node* node)
2600 { 2600 {
2601 if (node) 2601 if (node)
2602 node->showNodePathForThis(); 2602 node->showNodePathForThis();
2603 } 2603 }
2604 2604
2605 #endif 2605 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/Element.cpp ('k') | Source/core/dom/ScriptForbiddenScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698