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

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

Issue 75273004: Add 'exposed' objects and embeds to a document's named properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove extraneous empty line in expected output Created 7 years 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 | « Source/core/html/HTMLEmbedElement.cpp ('k') | Source/core/html/HTMLObjectElement.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, 2004, 2005, 2006, 2007, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2011, 2012 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 * 20 *
21 */ 21 */
22 22
23 #include "config.h" 23 #include "config.h"
24 #include "core/html/HTMLNameCollection.h" 24 #include "core/html/HTMLNameCollection.h"
25 25
26 #include "HTMLNames.h" 26 #include "HTMLNames.h"
27 #include "core/dom/Element.h" 27 #include "core/dom/Element.h"
28 #include "core/dom/ElementTraversal.h" 28 #include "core/dom/ElementTraversal.h"
29 #include "core/dom/NodeRareData.h" 29 #include "core/dom/NodeRareData.h"
30 #include "core/html/HTMLEmbedElement.h"
30 #include "core/html/HTMLObjectElement.h" 31 #include "core/html/HTMLObjectElement.h"
31 32
32 namespace WebCore { 33 namespace WebCore {
33 34
34 using namespace HTMLNames; 35 using namespace HTMLNames;
35 36
36 HTMLNameCollection::HTMLNameCollection(Node* document, CollectionType type, cons t AtomicString& name) 37 HTMLNameCollection::HTMLNameCollection(Node* document, CollectionType type, cons t AtomicString& name)
37 : HTMLCollection(document, type, OverridesItemAfter) 38 : HTMLCollection(document, type, OverridesItemAfter)
38 , m_name(name) 39 , m_name(name)
39 { 40 {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 if (current->getNameAttribute() == m_name) 73 if (current->getNameAttribute() == m_name)
73 return current; 74 return current;
74 } 75 }
75 if (current->getIdAttribute() == m_name) 76 if (current->getIdAttribute() == m_name)
76 return current; 77 return current;
77 break; 78 break;
78 case DocumentNamedItems: 79 case DocumentNamedItems:
79 // find images, forms, applets, embeds, objects and iframes by name, 80 // find images, forms, applets, embeds, objects and iframes by name,
80 // applets and object by id, and images by id but only if they have 81 // applets and object by id, and images by id but only if they have
81 // a name attribute (this very strange rule matches IE) 82 // a name attribute (this very strange rule matches IE)
82 if (current->hasTagName(formTag) || current->hasTagName(embedTag) || current->hasTagName(iframeTag)) { 83 if (current->hasTagName(formTag)
84 || current->hasTagName(iframeTag)
85 || (current->hasTagName(embedTag) && toHTMLEmbedElement(current) ->isExposed())) {
83 if (current->getNameAttribute() == m_name) 86 if (current->getNameAttribute() == m_name)
84 return current; 87 return current;
85 } else if (current->hasTagName(appletTag)) { 88 } else if (current->hasTagName(appletTag)
89 || (current->hasTagName(objectTag) && toHTMLObjectElement(curren t)->isExposed())) {
86 if (current->getNameAttribute() == m_name || current->getIdAttri bute() == m_name) 90 if (current->getNameAttribute() == m_name || current->getIdAttri bute() == m_name)
87 return current; 91 return current;
88 } else if (current->hasTagName(objectTag)) {
89 if ((current->getNameAttribute() == m_name || current->getIdAttr ibute() == m_name)
90 && toHTMLObjectElement(current)->isDocNamedItem())
91 return current;
92 } else if (current->hasTagName(imgTag)) { 92 } else if (current->hasTagName(imgTag)) {
93 if (current->getNameAttribute() == m_name || (current->getIdAttr ibute() == m_name && current->hasName())) 93 if (current->getNameAttribute() == m_name || (current->getIdAttr ibute() == m_name && current->hasName()))
94 return current; 94 return current;
95 } 95 }
96 break; 96 break;
97 default: 97 default:
98 ASSERT_NOT_REACHED(); 98 ASSERT_NOT_REACHED();
99 } 99 }
100 } 100 }
101 101
102 return 0; 102 return 0;
103 } 103 }
104 104
105 } 105 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLEmbedElement.cpp ('k') | Source/core/html/HTMLObjectElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698