| OLD | NEW |
|---|
| 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, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. | 5 * Copyright (C) 2004, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 | 28 |
| 29 namespace WebCore { | 29 namespace WebCore { |
| 30 | 30 |
| 31 ContainerNode& LiveNodeListBase::rootNode() const | 31 ContainerNode& LiveNodeListBase::rootNode() const |
| 32 { | 32 { |
| 33 if (isRootedAtDocument() && m_ownerNode->inDocument()) | 33 if (isRootedAtDocument() && m_ownerNode->inDocument()) |
| 34 return m_ownerNode->document(); | 34 return m_ownerNode->document(); |
| 35 return *m_ownerNode; | 35 return *m_ownerNode; |
| 36 } | 36 } |
| 37 | 37 |
| 38 void LiveNodeListBase::invalidateCache() const | |
| 39 { | |
| 40 m_cachedItem = 0; | |
| 41 m_isLengthCacheValid = false; | |
| 42 } | |
| 43 | |
| 44 void LiveNodeListBase::invalidateIdNameCacheMaps() const | 38 void LiveNodeListBase::invalidateIdNameCacheMaps() const |
| 45 { | 39 { |
| 46 ASSERT(hasIdNameCache()); | 40 ASSERT(hasIdNameCache()); |
| 47 static_cast<const HTMLCollection*>(this)->invalidateIdNameCacheMaps(); | 41 static_cast<const HTMLCollection*>(this)->invalidateIdNameCacheMaps(); |
| 48 } | 42 } |
| 49 | 43 |
| 44 void LiveNodeList::invalidateCache() const |
| 45 { |
| 46 m_collectionIndexCache.invalidate(); |
| 47 } |
| 48 |
| 50 Node* LiveNodeList::namedItem(const AtomicString& elementId) const | 49 Node* LiveNodeList::namedItem(const AtomicString& elementId) const |
| 51 { | 50 { |
| 52 Node& rootNode = this->rootNode(); | 51 Node& rootNode = this->rootNode(); |
| 53 | 52 |
| 54 if (rootNode.inDocument()) { | 53 if (rootNode.inDocument()) { |
| 55 Element* element = rootNode.treeScope().getElementById(elementId); | 54 Element* element = rootNode.treeScope().getElementById(elementId); |
| 56 if (element && nodeMatches(*element) && element->isDescendantOf(&rootNod
e)) | 55 if (element && nodeMatches(*element) && element->isDescendantOf(&rootNod
e)) |
| 57 return element; | 56 return element; |
| 58 if (!element) | 57 if (!element) |
| 59 return 0; | 58 return 0; |
| 60 // In the case of multiple nodes with the same name, just fall through. | 59 // In the case of multiple nodes with the same name, just fall through. |
| 61 } | 60 } |
| 62 | 61 |
| 63 unsigned length = this->length(); | 62 unsigned length = this->length(); |
| 64 for (unsigned i = 0; i < length; i++) { | 63 for (unsigned i = 0; i < length; i++) { |
| 65 Node* node = item(i); | 64 Node* node = item(i); |
| 66 // FIXME: This should probably be using getIdAttribute instead of idForS
tyleResolution. | 65 // FIXME: This should probably be using getIdAttribute instead of idForS
tyleResolution. |
| 67 if (node->hasID() && toElement(node)->idForStyleResolution() == elementI
d) | 66 if (node->hasID() && toElement(node)->idForStyleResolution() == elementI
d) |
| 68 return node; | 67 return node; |
| 69 } | 68 } |
| 70 | 69 |
| 71 return 0; | 70 return 0; |
| 72 } | 71 } |
| 73 | 72 |
| 74 } // namespace WebCore | 73 } // namespace WebCore |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 134193005:
Move caching out of LiveNodeListBase and into a new CollectionIndexCache class (Closed)
Base URL: svn://svn.chromium.org/blink/trunk