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

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

Issue 539603002: adoptNode wasn't clearing the accessibility cache. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add doctype, get rid of <html>, <head>, <body> Created 6 years, 3 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
« no previous file with comments | « LayoutTests/accessibility/adopt-node-causes-crash-expected.txt ('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 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU Library General Public 11 * modify it under the terms of the GNU Library General Public
12 * License as published by the Free Software Foundation; either 12 * License as published by the Free Software Foundation; either
13 * version 2 of the License, or (at your option) any later version. 13 * version 2 of the License, or (at your option) any later version.
14 * 14 *
15 * This library is distributed in the hope that it will be useful, 15 * This library is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of 16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * Library General Public License for more details. 18 * Library General Public License for more details.
19 * 19 *
20 * You should have received a copy of the GNU Library General Public License 20 * You should have received a copy of the GNU Library General Public License
21 * along with this library; see the file COPYING.LIB. If not, write to 21 * along with this library; see the file COPYING.LIB. If not, write to
22 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 22 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
23 * Boston, MA 02110-1301, USA. 23 * Boston, MA 02110-1301, USA.
24 */ 24 */
25 #include "config.h" 25 #include "config.h"
26 #include "core/dom/TreeScopeAdopter.h" 26 #include "core/dom/TreeScopeAdopter.h"
27 27
28 #include "core/accessibility/AXObjectCache.h"
28 #include "core/dom/Attr.h" 29 #include "core/dom/Attr.h"
29 #include "core/dom/NodeRareData.h" 30 #include "core/dom/NodeRareData.h"
30 #include "core/dom/NodeTraversal.h" 31 #include "core/dom/NodeTraversal.h"
31 #include "core/dom/shadow/ElementShadow.h" 32 #include "core/dom/shadow/ElementShadow.h"
32 #include "core/dom/shadow/ShadowRoot.h" 33 #include "core/dom/shadow/ShadowRoot.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 void TreeScopeAdopter::moveTreeToNewScope(Node& root) const 37 void TreeScopeAdopter::moveTreeToNewScope(Node& root) const
37 { 38 {
38 ASSERT(needsScopeChange()); 39 ASSERT(needsScopeChange());
39 40
40 #if !ENABLE(OILPAN) 41 #if !ENABLE(OILPAN)
41 oldScope().guardRef(); 42 oldScope().guardRef();
42 #endif 43 #endif
43 44
44 // If an element is moved from a document and then eventually back again the collection cache for 45 // If an element is moved from a document and then eventually back again the collection cache for
45 // that element may contain stale data as changes made to it will have updat ed the DOMTreeVersion 46 // that element may contain stale data as changes made to it will have updat ed the DOMTreeVersion
46 // of the document it was moved to. By increasing the DOMTreeVersion of the donating document here 47 // of the document it was moved to. By increasing the DOMTreeVersion of the donating document here
47 // we ensure that the collection cache will be invalidated as needed when th e element is moved back. 48 // we ensure that the collection cache will be invalidated as needed when th e element is moved back.
48 Document& oldDocument = oldScope().document(); 49 Document& oldDocument = oldScope().document();
49 Document& newDocument = newScope().document(); 50 Document& newDocument = newScope().document();
50 bool willMoveToNewDocument = oldDocument != newDocument; 51 bool willMoveToNewDocument = oldDocument != newDocument;
52 AXObjectCache* axObjectCache = oldDocument.existingAXObjectCache();
51 if (willMoveToNewDocument) 53 if (willMoveToNewDocument)
52 oldDocument.incDOMTreeVersion(); 54 oldDocument.incDOMTreeVersion();
53 55
54 for (Node* node = &root; node; node = NodeTraversal::next(*node, &root)) { 56 for (Node* node = &root; node; node = NodeTraversal::next(*node, &root)) {
55 updateTreeScope(*node); 57 updateTreeScope(*node);
56 58
57 if (willMoveToNewDocument) 59 if (willMoveToNewDocument) {
60 if (axObjectCache)
61 axObjectCache->remove(node);
58 moveNodeToNewDocument(*node, oldDocument, newDocument); 62 moveNodeToNewDocument(*node, oldDocument, newDocument);
59 else if (node->hasRareData()) { 63 } else if (node->hasRareData()) {
60 NodeRareData* rareData = node->rareData(); 64 NodeRareData* rareData = node->rareData();
61 if (rareData->nodeLists()) 65 if (rareData->nodeLists())
62 rareData->nodeLists()->adoptTreeScope(); 66 rareData->nodeLists()->adoptTreeScope();
63 } 67 }
64 68
65 if (!node->isElementNode()) 69 if (!node->isElementNode())
66 continue; 70 continue;
67 71
68 if (node->hasSyntheticAttrChildNodes()) { 72 if (node->hasSyntheticAttrChildNodes()) {
69 WillBeHeapVector<RefPtrWillBeMember<Attr> >& attrs = *toElement(node )->attrNodeList(); 73 WillBeHeapVector<RefPtrWillBeMember<Attr> >& attrs = *toElement(node )->attrNodeList();
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 #if ENABLE(ASSERT) 138 #if ENABLE(ASSERT)
135 didMoveToNewDocumentWasCalled = false; 139 didMoveToNewDocumentWasCalled = false;
136 oldDocumentDidMoveToNewDocumentWasCalledWith = &oldDocument; 140 oldDocumentDidMoveToNewDocumentWasCalledWith = &oldDocument;
137 #endif 141 #endif
138 142
139 node.didMoveToNewDocument(oldDocument); 143 node.didMoveToNewDocument(oldDocument);
140 ASSERT(didMoveToNewDocumentWasCalled); 144 ASSERT(didMoveToNewDocumentWasCalled);
141 } 145 }
142 146
143 } 147 }
OLDNEW
« no previous file with comments | « LayoutTests/accessibility/adopt-node-causes-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698