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

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

Issue 189923002: Use new Traversal<HTML*Element> API in HTML code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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/html/HTMLMediaElement.cpp ('k') | Source/core/html/HTMLTableElement.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) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 } 138 }
139 139
140 // FIXME: This function should not deal with url or serviceType! 140 // FIXME: This function should not deal with url or serviceType!
141 void HTMLObjectElement::parametersForPlugin(Vector<String>& paramNames, Vector<S tring>& paramValues, String& url, String& serviceType) 141 void HTMLObjectElement::parametersForPlugin(Vector<String>& paramNames, Vector<S tring>& paramValues, String& url, String& serviceType)
142 { 142 {
143 HashSet<StringImpl*, CaseFoldingHash> uniqueParamNames; 143 HashSet<StringImpl*, CaseFoldingHash> uniqueParamNames;
144 String urlParameter; 144 String urlParameter;
145 145
146 // Scan the PARAM children and store their name/value pairs. 146 // Scan the PARAM children and store their name/value pairs.
147 // Get the URL and type from the params if we don't already have them. 147 // Get the URL and type from the params if we don't already have them.
148 for (Element* child = ElementTraversal::firstWithin(*this); child; child = E lementTraversal::nextSibling(*child)) { 148 for (HTMLParamElement* p = Traversal<HTMLParamElement>::firstChild(*this); p ; p = Traversal<HTMLParamElement>::nextSibling(*p)) {
149 if (!child->hasTagName(paramTag))
150 continue;
151
152 HTMLParamElement* p = toHTMLParamElement(child);
153 String name = p->name(); 149 String name = p->name();
154 if (name.isEmpty()) 150 if (name.isEmpty())
155 continue; 151 continue;
156 152
157 uniqueParamNames.add(name.impl()); 153 uniqueParamNames.add(name.impl());
158 paramNames.append(p->name()); 154 paramNames.append(p->name());
159 paramValues.append(p->value()); 155 paramValues.append(p->value());
160 156
161 // FIXME: url adjustment does not belong in this function. 157 // FIXME: url adjustment does not belong in this function.
162 if (url.isEmpty() && urlParameter.isEmpty() && (equalIgnoringCase(name, "src") || equalIgnoringCase(name, "movie") || equalIgnoringCase(name, "code") || equalIgnoringCase(name, "url"))) 158 if (url.isEmpty() && urlParameter.isEmpty() && (equalIgnoringCase(name, "src") || equalIgnoringCase(name, "movie") || equalIgnoringCase(name, "code") || equalIgnoringCase(name, "url")))
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 { 473 {
478 return fastHasAttribute(usemapAttr); 474 return fastHasAttribute(usemapAttr);
479 } 475 }
480 476
481 bool HTMLObjectElement::useFallbackContent() const 477 bool HTMLObjectElement::useFallbackContent() const
482 { 478 {
483 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 479 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
484 } 480 }
485 481
486 } 482 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/HTMLTableElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698