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

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

Issue 18258003: Pow __proto__, sock :unresolved, and clunk the created callback at once. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Try to be nicer to MSVC. Created 7 years, 5 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
« no previous file with comments | « Source/core/dom/CustomElementUpgradeCandidateMap.h ('k') | Source/core/dom/Element.h » ('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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 32
33 #include "core/dom/CustomElementUpgradeCandidateMap.h" 33 #include "core/dom/CustomElementUpgradeCandidateMap.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 void CustomElementUpgradeCandidateMap::add(CustomElementDefinition::CustomElemen tKind kind, const AtomicString& type, Element* element) 37 void CustomElementUpgradeCandidateMap::add(CustomElementDefinition::CustomElemen tKind kind, const AtomicString& type, Element* element)
38 { 38 {
39 m_unresolvedElements.add(element, RequiredDefinition(kind, type)); 39 m_upgradeCandidates.add(element, RequiredDefinition(kind, type));
40 40
41 UnresolvedDefinitionMap::iterator it = m_unresolvedDefinitions.find(type); 41 UnresolvedDefinitionMap::iterator it = m_unresolvedDefinitions.find(type);
42 if (it == m_unresolvedDefinitions.end()) 42 if (it == m_unresolvedDefinitions.end())
43 it = m_unresolvedDefinitions.add(type, ElementSet()).iterator; 43 it = m_unresolvedDefinitions.add(type, ElementSet()).iterator;
44 it->value.add(element); 44 it->value.add(element);
45 } 45 }
46 46
47 bool CustomElementUpgradeCandidateMap::contains(Element* element) const
48 {
49 return m_unresolvedElements.contains(element);
50 }
51
52 void CustomElementUpgradeCandidateMap::remove(Element* element) 47 void CustomElementUpgradeCandidateMap::remove(Element* element)
53 { 48 {
54 UnresolvedElementMap::iterator it = m_unresolvedElements.find(element); 49 UpgradeCandidateMap::iterator it = m_upgradeCandidates.find(element);
55 if (it == m_unresolvedElements.end()) 50 if (it == m_upgradeCandidates.end())
56 return; 51 return;
57 52
58 const AtomicString& type = it->value.second; 53 const AtomicString& type = it->value.second;
59 m_unresolvedDefinitions.get(type).remove(element); 54 m_unresolvedDefinitions.get(type).remove(element);
60 m_unresolvedElements.remove(it); 55 m_upgradeCandidates.remove(it);
61 } 56 }
62 57
63 CustomElementUpgradeCandidateMap::ElementSet CustomElementUpgradeCandidateMap::t akeUpgradeCandidatesFor(CustomElementDefinition* definition) 58 Vector<Element*> CustomElementUpgradeCandidateMap::takeUpgradeCandidatesFor(Cust omElementDefinition* definition)
64 { 59 {
65 UnresolvedDefinitionMap::iterator it = m_unresolvedDefinitions.find(definiti on->type()); 60 UnresolvedDefinitionMap::iterator it = m_unresolvedDefinitions.find(definiti on->type());
66 if (it == m_unresolvedDefinitions.end()) 61 if (it == m_unresolvedDefinitions.end())
67 return ElementSet(); 62 return Vector<Element*>();
68 63
69 const ElementSet& candidatesForThisType = it->value; 64 const ElementSet& candidatesForThisType = it->value;
70 ElementSet matchingCandidates; 65 Vector<Element*> matchingCandidates;
71 66
72 // Filter the set based on whether the definition matches 67 // Filter the set based on whether the definition matches
73 for (ElementSet::const_iterator candidate = candidatesForThisType.begin(); c andidate != candidatesForThisType.end(); ++candidate) { 68 for (ElementSet::const_iterator candidate = candidatesForThisType.begin(); c andidate != candidatesForThisType.end(); ++candidate) {
74 if (matches(definition, *candidate)) { 69 if (matches(definition, *candidate)) {
75 matchingCandidates.add(*candidate); 70 matchingCandidates.append(*candidate);
76 m_unresolvedElements.remove(*candidate); 71 m_upgradeCandidates.remove(*candidate);
77 } 72 }
78 } 73 }
79 74
80 m_unresolvedDefinitions.remove(it); 75 m_unresolvedDefinitions.remove(it);
81 return matchingCandidates; 76 return matchingCandidates;
82 } 77 }
83 78
84 bool CustomElementUpgradeCandidateMap::matches(CustomElementDefinition* definiti on, Element* element) 79 bool CustomElementUpgradeCandidateMap::matches(CustomElementDefinition* definiti on, Element* element)
85 { 80 {
86 ASSERT(m_unresolvedElements.contains(element)); 81 ASSERT(m_upgradeCandidates.contains(element));
87 const RequiredDefinition& requirement = m_unresolvedElements.get(element); 82 const RequiredDefinition& requirement = m_upgradeCandidates.get(element);
88 return definition->kind() == requirement.first && definition->type() == requ irement.second && definition->namespaceURI() == element->namespaceURI() && defin ition->name() == element->localName(); 83 return definition->kind() == requirement.first && definition->type() == requ irement.second && definition->namespaceURI() == element->namespaceURI() && defin ition->name() == element->localName();
89 } 84 }
90 85
91 } 86 }
OLDNEW
« no previous file with comments | « Source/core/dom/CustomElementUpgradeCandidateMap.h ('k') | Source/core/dom/Element.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698