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

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

Issue 1179103002: Forbid entering recalcStyle or attach from inside detach. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/Element.cpp ('k') | no next file » | 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 904 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 915
916 // We only need to detach if the node has already been through attach(). 916 // We only need to detach if the node has already been through attach().
917 if (styleChangeType() < NeedsReattachStyleChange) 917 if (styleChangeType() < NeedsReattachStyleChange)
918 detach(reattachContext); 918 detach(reattachContext);
919 attach(reattachContext); 919 attach(reattachContext);
920 } 920 }
921 921
922 void Node::attach(const AttachContext&) 922 void Node::attach(const AttachContext&)
923 { 923 {
924 ASSERT(document().inStyleRecalc() || isDocumentNode()); 924 ASSERT(document().inStyleRecalc() || isDocumentNode());
925 ASSERT(!document().lifecycle().inDetach());
925 ASSERT(needsAttach()); 926 ASSERT(needsAttach());
926 ASSERT(!layoutObject() || (layoutObject()->style() && (layoutObject()->paren t() || layoutObject()->isLayoutView()))); 927 ASSERT(!layoutObject() || (layoutObject()->style() && (layoutObject()->paren t() || layoutObject()->isLayoutView())));
927 928
928 clearNeedsStyleRecalc(); 929 clearNeedsStyleRecalc();
929 930
930 if (AXObjectCache* cache = document().axObjectCache()) 931 if (AXObjectCache* cache = document().axObjectCache())
931 cache->updateCacheAfterNodeIsAttached(this); 932 cache->updateCacheAfterNodeIsAttached(this);
932 } 933 }
933 934
934 void Node::detach(const AttachContext& context) 935 void Node::detach(const AttachContext& context)
(...skipping 1531 matching lines...) Expand 10 before | Expand all | Expand 10 after
2466 2467
2467 void showNodePath(const blink::Node* node) 2468 void showNodePath(const blink::Node* node)
2468 { 2469 {
2469 if (node) 2470 if (node)
2470 node->showNodePathForThis(); 2471 node->showNodePathForThis();
2471 else 2472 else
2472 fprintf(stderr, "Cannot showNodePath for (nil)\n"); 2473 fprintf(stderr, "Cannot showNodePath for (nil)\n");
2473 } 2474 }
2474 2475
2475 #endif 2476 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/Element.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698