Chromium Code Reviews Chromium Code Reviews
Issue 113653006:
Remove complexity related to m_cachedElementsArrayOffset from LiveNodeListBase (Closed)
Base URL: svn://svn.chromium.org/blink/trunk| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 return 0; | 42 return 0; |
| 43 return toContainerNode(&rootNode); | 43 return toContainerNode(&rootNode); |
| 44 } | 44 } |
| 45 | 45 |
| 46 void LiveNodeListBase::invalidateCache() const | 46 void LiveNodeListBase::invalidateCache() const |
| 47 { | 47 { |
| 48 m_cachedItem = 0; | 48 m_cachedItem = 0; |
| 49 m_isLengthCacheValid = false; | 49 m_isLengthCacheValid = false; |
| 50 m_isItemCacheValid = false; | 50 m_isItemCacheValid = false; |
| 51 m_isNameCacheValid = false; | 51 m_isNameCacheValid = false; |
| 52 if (isNodeList(type())) | |
| 53 return; | |
| 54 | |
| 55 const HTMLCollection* cacheBase = static_cast<const HTMLCollection*>(this); | |
| 56 cacheBase->m_idCache.clear(); | |
| 57 cacheBase->m_nameCache.clear(); | |
| 58 cacheBase->m_cachedElementsArrayOffset = 0; | |
| 59 } | 52 } |
| 60 | 53 |
| 61 void LiveNodeListBase::invalidateIdNameCacheMaps() const | 54 void LiveNodeListBase::invalidateIdNameCacheMaps() const |
| 62 { | 55 { |
| 63 ASSERT(hasIdNameCache()); | 56 ASSERT(hasIdNameCache()); |
| 64 const HTMLCollection* cacheBase = static_cast<const HTMLCollection*>(this); | 57 static_cast<const HTMLCollection*>(this)->invalidateIdNameCacheMaps(); |
|
eseidel
2014/01/03 17:45:00
Bleh.
| |
| 65 cacheBase->m_idCache.clear(); | |
| 66 cacheBase->m_nameCache.clear(); | |
| 67 } | 58 } |
| 68 | 59 |
| 69 Node* LiveNodeList::namedItem(const AtomicString& elementId) const | 60 Node* LiveNodeList::namedItem(const AtomicString& elementId) const |
| 70 { | 61 { |
| 71 Node& rootNode = this->rootNode(); | 62 Node& rootNode = this->rootNode(); |
| 72 | 63 |
| 73 if (rootNode.inDocument()) { | 64 if (rootNode.inDocument()) { |
| 74 Element* element = rootNode.treeScope().getElementById(elementId); | 65 Element* element = rootNode.treeScope().getElementById(elementId); |
| 75 if (element && nodeMatches(element) && element->isDescendantOf(&rootNode )) | 66 if (element && nodeMatches(element) && element->isDescendantOf(&rootNode )) |
| 76 return element; | 67 return element; |
| 77 if (!element) | 68 if (!element) |
| 78 return 0; | 69 return 0; |
| 79 // In the case of multiple nodes with the same name, just fall through. | 70 // In the case of multiple nodes with the same name, just fall through. |
| 80 } | 71 } |
| 81 | 72 |
| 82 unsigned length = this->length(); | 73 unsigned length = this->length(); |
| 83 for (unsigned i = 0; i < length; i++) { | 74 for (unsigned i = 0; i < length; i++) { |
| 84 Node* node = item(i); | 75 Node* node = item(i); |
| 85 // FIXME: This should probably be using getIdAttribute instead of idForS tyleResolution. | 76 // FIXME: This should probably be using getIdAttribute instead of idForS tyleResolution. |
| 86 if (node->hasID() && toElement(node)->idForStyleResolution() == elementI d) | 77 if (node->hasID() && toElement(node)->idForStyleResolution() == elementI d) |
| 87 return node; | 78 return node; |
| 88 } | 79 } |
| 89 | 80 |
| 90 return 0; | 81 return 0; |
| 91 } | 82 } |
| 92 | 83 |
| 93 } // namespace WebCore | 84 } // namespace WebCore |
| OLD | NEW |
