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

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

Issue 27537009: Avoid always style recalc when removing stylesheets. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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
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 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 if (m_scopingNodesRemoved) 45 if (m_scopingNodesRemoved)
46 m_scopingNodesRemoved->remove(node); 46 m_scopingNodesRemoved->remove(node);
47 } 47 }
48 48
49 void StyleSheetScopingNodeList::remove(ContainerNode* node) 49 void StyleSheetScopingNodeList::remove(ContainerNode* node)
50 { 50 {
51 if (isTreeScopeRoot(node) || !m_scopingNodes) 51 if (isTreeScopeRoot(node) || !m_scopingNodes)
52 return; 52 return;
53 53
54 m_scopingNodes->remove(node); 54 // If the node is still working as a scoping node, we cannot remove.
55 if (node->inDocument() && node->numberOfScopedHTMLStyleChildren()) 55 if (node->inDocument() && node->numberOfScopedHTMLStyleChildren())
56 return; 56 return;
57 57
58 m_scopingNodes->remove(node);
58 if (!m_scopingNodesRemoved) 59 if (!m_scopingNodesRemoved)
59 m_scopingNodesRemoved = adoptPtr(new ListHashSet<Node*, 4>()); 60 m_scopingNodesRemoved = adoptPtr(new ListHashSet<Node*, 4>());
60 m_scopingNodesRemoved->add(node); 61 m_scopingNodesRemoved->add(node);
61 } 62 }
62 63
63 } 64 }
64 65
65 66
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698