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

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

Issue 171663005: Consistently use ElementTraversal API when looking for an Element (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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/Node.cpp ('k') | Source/core/html/HTMLDetailsElement.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, 2008, 2009, 2012 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012 Apple Inc. All rights reserv ed.
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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 paramNames.append("baseURL"); 165 paramNames.append("baseURL");
166 KURL baseURL = document().baseURL(); 166 KURL baseURL = document().baseURL();
167 paramValues.append(baseURL.string()); 167 paramValues.append(baseURL.string());
168 168
169 const AtomicString& mayScript = getAttribute(mayscriptAttr); 169 const AtomicString& mayScript = getAttribute(mayscriptAttr);
170 if (!mayScript.isNull()) { 170 if (!mayScript.isNull()) {
171 paramNames.append("mayScript"); 171 paramNames.append("mayScript");
172 paramValues.append(mayScript.string()); 172 paramValues.append(mayScript.string());
173 } 173 }
174 174
175 for (Node* child = firstChild(); child; child = child->nextSibling()) { 175 for (Element* child = ElementTraversal::firstWithin(*this); child; child = E lementTraversal::nextSibling(*child)) {
176 if (!child->hasTagName(paramTag)) 176 if (!child->hasTagName(paramTag))
177 continue; 177 continue;
178 178
179 HTMLParamElement* param = toHTMLParamElement(child); 179 HTMLParamElement* param = toHTMLParamElement(child);
180 if (param->name().isEmpty()) 180 if (param->name().isEmpty())
181 continue; 181 continue;
182 182
183 paramNames.append(param->name()); 183 paramNames.append(param->name());
184 paramValues.append(param->value()); 184 paramValues.append(param->value());
185 } 185 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 223
224 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) 224 if (!document().contentSecurityPolicy()->allowObjectFromSource(url)
225 || !document().contentSecurityPolicy()->allowPluginType(appletMimeType, appletMimeType, url)) { 225 || !document().contentSecurityPolicy()->allowPluginType(appletMimeType, appletMimeType, url)) {
226 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy); 226 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy);
227 return false; 227 return false;
228 } 228 }
229 return true; 229 return true;
230 } 230 }
231 231
232 } 232 }
OLDNEW
« no previous file with comments | « Source/core/dom/Node.cpp ('k') | Source/core/html/HTMLDetailsElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698