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

Side by Side Diff: WebCore/dom/Document.cpp

Issue 3565007: Merge 68096 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 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
« no previous file with comments | « WebCore/dom/Attr.cpp ('k') | WebCore/dom/Element.cpp » ('j') | 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 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
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 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 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
(...skipping 1171 matching lines...) Expand 10 before | Expand all | Expand 10 after
1182 } 1182 }
1183 m_duplicateIds.add(elementId.impl()); 1183 m_duplicateIds.add(elementId.impl());
1184 } 1184 }
1185 1185
1186 void Document::removeElementById(const AtomicString& elementId, Element* element ) 1186 void Document::removeElementById(const AtomicString& elementId, Element* element )
1187 { 1187 {
1188 m_elementsById.checkConsistency(); 1188 m_elementsById.checkConsistency();
1189 1189
1190 if (m_elementsById.get(elementId.impl()) == element) 1190 if (m_elementsById.get(elementId.impl()) == element)
1191 m_elementsById.remove(elementId.impl()); 1191 m_elementsById.remove(elementId.impl());
1192 else 1192 else {
1193 ASSERT(m_inRemovedLastRefFunction || m_duplicateIds.contains(elementId.i mpl()));
1193 m_duplicateIds.remove(elementId.impl()); 1194 m_duplicateIds.remove(elementId.impl());
1195 }
1194 } 1196 }
1195 1197
1196 Element* Document::getElementByAccessKey(const String& key) const 1198 Element* Document::getElementByAccessKey(const String& key) const
1197 { 1199 {
1198 if (key.isEmpty()) 1200 if (key.isEmpty())
1199 return 0; 1201 return 0;
1200 if (!m_accessKeyMapValid) { 1202 if (!m_accessKeyMapValid) {
1201 for (Node* n = firstChild(); n; n = n->traverseNextNode()) { 1203 for (Node* n = firstChild(); n; n = n->traverseNextNode()) {
1202 if (!n->isElementNode()) 1204 if (!n->isElementNode())
1203 continue; 1205 continue;
(...skipping 3567 matching lines...) Expand 10 before | Expand all | Expand 10 after
4771 void Document::decrementLoadEventDelayCount() 4773 void Document::decrementLoadEventDelayCount()
4772 { 4774 {
4773 ASSERT(m_loadEventDelayCount); 4775 ASSERT(m_loadEventDelayCount);
4774 --m_loadEventDelayCount; 4776 --m_loadEventDelayCount;
4775 4777
4776 if (frame() && !m_loadEventDelayCount) 4778 if (frame() && !m_loadEventDelayCount)
4777 frame()->loader()->checkCompleted(); 4779 frame()->loader()->checkCompleted();
4778 } 4780 }
4779 4781
4780 } // namespace WebCore 4782 } // namespace WebCore
OLDNEW
« no previous file with comments | « WebCore/dom/Attr.cpp ('k') | WebCore/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698