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

Side by Side Diff: Source/core/html/HTMLCollection.cpp

Issue 485093003: Make it obvious an HTMLOptionsCollection can only contain HTMLOptionElements (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | « no previous file | Source/core/html/HTMLOptionsCollection.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) 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 * Copyright (C) 2003-2008, 2011, 2012, 2014 Apple Inc. All rights reserved. 4 * Copyright (C) 2003-2008, 2011, 2012, 2014 Apple Inc. All rights reserved.
5 * Copyright (C) 2014 Samsung Electronics. All rights reserved. 5 * Copyright (C) 2014 Samsung Electronics. 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 14 matching lines...) Expand all
25 #include "core/html/HTMLCollection.h" 25 #include "core/html/HTMLCollection.h"
26 26
27 #include "core/HTMLNames.h" 27 #include "core/HTMLNames.h"
28 #include "core/dom/ClassCollection.h" 28 #include "core/dom/ClassCollection.h"
29 #include "core/dom/ElementTraversal.h" 29 #include "core/dom/ElementTraversal.h"
30 #include "core/dom/NodeRareData.h" 30 #include "core/dom/NodeRareData.h"
31 #include "core/html/DocumentNameCollection.h" 31 #include "core/html/DocumentNameCollection.h"
32 #include "core/html/HTMLElement.h" 32 #include "core/html/HTMLElement.h"
33 #include "core/html/HTMLObjectElement.h" 33 #include "core/html/HTMLObjectElement.h"
34 #include "core/html/HTMLOptionElement.h" 34 #include "core/html/HTMLOptionElement.h"
35 #include "core/html/HTMLOptionsCollection.h"
35 #include "core/html/HTMLTagCollection.h" 36 #include "core/html/HTMLTagCollection.h"
36 #include "core/html/WindowNameCollection.h" 37 #include "core/html/WindowNameCollection.h"
37 #include "wtf/HashSet.h" 38 #include "wtf/HashSet.h"
38 39
39 namespace blink { 40 namespace blink {
40 41
41 using namespace HTMLNames; 42 using namespace HTMLNames;
42 43
43 static bool shouldTypeOnlyIncludeDirectChildren(CollectionType type) 44 static bool shouldTypeOnlyIncludeDirectChildren(CollectionType type)
44 { 45 {
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 return element.hasTagName(scriptTag); 211 return element.hasTagName(scriptTag);
211 case DocForms: 212 case DocForms:
212 return element.hasTagName(formTag); 213 return element.hasTagName(formTag);
213 case TableTBodies: 214 case TableTBodies:
214 return element.hasTagName(tbodyTag); 215 return element.hasTagName(tbodyTag);
215 case TRCells: 216 case TRCells:
216 return element.hasTagName(tdTag) || element.hasTagName(thTag); 217 return element.hasTagName(tdTag) || element.hasTagName(thTag);
217 case TSectionRows: 218 case TSectionRows:
218 return element.hasTagName(trTag); 219 return element.hasTagName(trTag);
219 case SelectOptions: 220 case SelectOptions:
220 return element.hasTagName(optionTag); 221 return toHTMLOptionsCollection(htmlCollection).elementMatches(element);
221 case SelectedOptions: 222 case SelectedOptions:
222 return isHTMLOptionElement(element) && toHTMLOptionElement(element).sele cted(); 223 return isHTMLOptionElement(element) && toHTMLOptionElement(element).sele cted();
223 case DataListOptions: 224 case DataListOptions:
224 if (isHTMLOptionElement(element)) { 225 if (isHTMLOptionElement(element)) {
225 const HTMLOptionElement& option = toHTMLOptionElement(element); 226 const HTMLOptionElement& option = toHTMLOptionElement(element);
226 if (!option.isDisabledFormControl() && !option.value().isEmpty()) 227 if (!option.isDisabledFormControl() && !option.value().isEmpty())
227 return true; 228 return true;
228 } 229 }
229 return false; 230 return false;
230 case MapAreas: 231 case MapAreas:
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 } 504 }
504 505
505 void HTMLCollection::trace(Visitor* visitor) 506 void HTMLCollection::trace(Visitor* visitor)
506 { 507 {
507 visitor->trace(m_namedItemCache); 508 visitor->trace(m_namedItemCache);
508 visitor->trace(m_collectionIndexCache); 509 visitor->trace(m_collectionIndexCache);
509 LiveNodeListBase::trace(visitor); 510 LiveNodeListBase::trace(visitor);
510 } 511 }
511 512
512 } // namespace blink 513 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLOptionsCollection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698